chrome/browser/app_controller_mac.mm - Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources.

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/app_controller_mac.mm

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

Patch Set: 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

« no previous file with comments | « chrome/browser/about_flags_unittest.cc ('k') | chrome/browser/autocomplete/autocomplete_controller.cc » ('j') | chrome/browser/password_manager/password_manager_util_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/app_controller_mac.mm

diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm

index 57fb2812d3edd23536a54f6a139f88f195b527d1..c1be6cdaccebf9b1824e21f40f51c9c02b2bd56c 100644

--- a/chrome/browser/app_controller_mac.mm

+++ b/chrome/browser/app_controller_mac.mm

@@ -77,8 +77,10 @@

#include "chrome/common/mac/app_mode_common.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

-#include "components/signin/core/common/profile_management_switches.h"

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

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

#include "components/signin/core/browser/signin_manager.h"

+#include "components/signin/core/common/profile_management_switches.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/download_manager.h"

#include "content/public/browser/notification_service.h"

@@ -86,8 +88,6 @@

#include "content/public/browser/plugin_service.h"

#include "content/public/browser/user_metrics.h"

#include "extensions/browser/extension_system.h"

-#include "grit/chromium_strings.h"

-#include "grit/generated_resources.h"

#include "net/base/filename_util.h"

#include "ui/base/cocoa/focus_window_set.h"

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