chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

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/ui/aura/chrome_browser_main_extra_parts_aura.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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/ui/aura/chrome_browser_main_extra_parts_aura.cc

diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

index 259b07363833b1f64c1115e349905d1f4cf2a983..b9cbe2f5131144351d1ec5433efcc386aa71b32b 100644

--- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

+++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

@@ -11,8 +11,8 @@

#include "chrome/browser/ui/host_desktop.h"

#include "chrome/browser/ui/simple_message_box.h"

#include "chrome/common/chrome_switches.h"

-#include "grit/chromium_strings.h"

-#include "grit/generated_resources.h"

+#include "chrome/grit/chromium_strings.h"

+#include "chrome/grit/generated_resources.h"

#include "ui/aura/env.h"

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

#include "ui/gfx/screen.h"

@@ -31,10 +31,6 @@

#if defined(USE_ASH)

#include "chrome/browser/ui/ash/ash_init.h"

-#if defined(OS_WIN)

-#include "base/command_line.h"

-#include "chrome/common/chrome_switches.h"

-#endif // defined(OS_WIN)

#endif // defined(USE_ASH)

#if !defined(OS_CHROMEOS)

« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/auto_login_infobar_delegate.cc » ('j') | no next file with comments »