summaryrefslogtreecommitdiffstats
path: root/chrome/browser/app_controller_mac.mm
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-22 10:18:18 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-22 10:20:07 +0000
commitaf39f00e1d36360ab4119b873f2a9cc961d4464b (patch)
treecb520de46867506827af3cd9ac71c55cfc323f75 /chrome/browser/app_controller_mac.mm
parent0a0291c65f3cc23cc1b5a3c211019fce1d8ab007 (diff)
downloadchromium_src-af39f00e1d36360ab4119b873f2a9cc961d4464b.zip
chromium_src-af39f00e1d36360ab4119b873f2a9cc961d4464b.tar.gz
chromium_src-af39f00e1d36360ab4119b873f2a9cc961d4464b.tar.bz2
Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 1)
BUG=401588 Review URL: https://codereview.chromium.org/469993006 Cr-Commit-Position: refs/heads/master@{#291367} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_controller_mac.mm')
-rw-r--r--chrome/browser/app_controller_mac.mm6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 6c5f2bb..ac2a19e 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"