Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1216)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/chrome/browser/shell_integration.cc

Issue 13590004: Revert 192504 "Re-apply 192420: Move login switches to src/chromeos" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 9 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 | « trunk/src/chrome/browser/profiles/profile_manager_unittest.cc ('k') | trunk/src/chrome/browser/ui/ash/ash_init.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/shell_integration.cc
===================================================================
--- trunk/src/chrome/browser/shell_integration.cc (revision 192508)
+++ trunk/src/chrome/browser/shell_integration.cc (working copy)
@@ -18,10 +18,6 @@
#include "chrome/common/pref_names.h"
#include "content/public/browser/browser_thread.h"
-#if defined(OS_CHROMEOS)
-#include "chromeos/chromeos_switches.h"
-#endif
-
using content::BrowserThread;
ShellIntegration::DefaultWebClientSetPermission
@@ -85,10 +81,9 @@
}
#if defined(OS_CHROMEOS)
- base::FilePath profile = cmd_line.GetSwitchValuePath(
- chromeos::switches::kLoginProfile);
+ base::FilePath profile = cmd_line.GetSwitchValuePath(switches::kLoginProfile);
if (!profile.empty())
- new_cmd_line.AppendSwitchPath(chromeos::switches::kLoginProfile, profile);
+ new_cmd_line.AppendSwitchPath(switches::kLoginProfile, profile);
#else
if (!profile_path.empty() && !extension_app_id.empty())
new_cmd_line.AppendSwitchPath(switches::kProfileDirectory,
« no previous file with comments | « trunk/src/chrome/browser/profiles/profile_manager_unittest.cc ('k') | trunk/src/chrome/browser/ui/ash/ash_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698