chrome/browser/chrome_browser_main.cc - Issue 530623002: Use qualified path for three more grit headers from ui.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 530623002: Use qualified path for three more grit headers from ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: ui_resources too Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/chrome_browser_main.cc

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc

index 0dfe121a4a511e236ea9e1d37335a2745a68d3ca..14ab8a445ab68d5a3eafce59e2fb76cd26a216a8 100644

--- a/chrome/browser/chrome_browser_main.cc

+++ b/chrome/browser/chrome_browser_main.cc

@@ -121,7 +121,6 @@

#include "content/public/common/content_client.h"

#include "content/public/common/content_switches.h"

#include "content/public/common/main_function_params.h"

-#include "grit/app_locale_settings.h"

#include "grit/platform_locale_settings.h"

#include "net/base/net_module.h"

#include "net/base/sdch_manager.h"

@@ -132,6 +131,7 @@

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/layout.h"

#include "ui/base/resource/resource_bundle.h"

+#include "ui/strings/grit/app_locale_settings.h"

#if defined(OS_ANDROID)

#include "chrome/browser/metrics/thread_watcher_android.h"

« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main_win.cc » ('j') | no next file with comments »