chromium/src
0
Fork 0
Code Activity

grit: Absolute includes for shell_resources.h

Browse Source 
Also qualify a straggler include of theme_resource.h (but the .gn file can't
set use_qualified_include=true for this one yet until grit writes a qualified
include for the generated _map.cc file).

BUG=401588

Review-Url: https://codereview.chromium.org/2719823002
Cr-Commit-Position: refs/heads/master@{#453209}
This commit is contained in:
thakis
2017-02-27 06:35:30 -08:00
committed by Commit bot
parent fac86e7952
commit da47dac5f7
6 changed files with 6 additions and 5 deletions

2
apps/DEPS

@ -26,7 +26,7 @@ include_rules = [
"+chrome/common/chrome_switches.h",
# For default app icon.
"!grit/theme_resources.h",
"!chrome/grit/theme_resources.h",
# Pieces of the extensions system that need to move to src/extensions.
# See http://crbug.com/162530 for details.

2
apps/ui/views/app_window_frame_view.cc

@ -6,9 +6,9 @@
#include "base/strings/utf_string_conversions.h"
#include "cc/paint/paint_flags.h"
#include "chrome/grit/theme_resources.h"
#include "extensions/browser/app_window/native_app_window.h"
#include "extensions/common/draggable_region.h"
#include "grit/theme_resources.h"
#include "third_party/skia/include/core/SkRegion.h"
#include "ui/base/hit_test.h"
#include "ui/base/l10n/l10n_util.h"

1
content/shell/BUILD.gn

@ -384,6 +384,7 @@ grit("content_shell_resources_grit") {
# External code should depend on ":resources" instead.
visibility = [ ":*" ]
source = "shell_resources.grd"
use_qualified_include = true
outputs = [
"grit/shell_resources.h",
"shell_resources.pak",

2
content/shell/browser/shell_content_browser_client.cc

@ -37,7 +37,7 @@
#include "content/shell/browser/shell_web_contents_view_delegate_creator.h"
#include "content/shell/common/shell_messages.h"
#include "content/shell/common/shell_switches.h"
#include "grit/shell_resources.h"
#include "content/shell/grit/shell_resources.h"
#include "net/url_request/url_request_context_getter.h"
#include "storage/browser/quota/quota_settings.h"
#include "ui/base/resource/resource_bundle.h"

2
content/shell/browser/shell_devtools_manager_delegate.cc

@ -31,7 +31,7 @@
#include "content/public/common/user_agent.h"
#include "content/shell/browser/shell.h"
#include "content/shell/common/shell_content_client.h"
#include "grit/shell_resources.h"
#include "content/shell/grit/shell_resources.h"
#include "net/base/net_errors.h"
#include "net/log/net_log_source.h"
#include "net/socket/tcp_server_socket.h"

2
content/shell/common/shell_content_client.cc

@ -14,7 +14,7 @@
#include "content/public/common/content_switches.h"
#include "content/public/common/user_agent.h"
#include "content/shell/common/shell_switches.h"
#include "grit/shell_resources.h"
#include "content/shell/grit/shell_resources.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"