5 files changed, 14 insertions, 13 deletions
diff --git a/chrome/common/chrome_plugin_util.cc b/chrome/common/chrome_plugin_util.cc
index 4643a87..e3b0f40 100644
--- a/chrome/common/chrome_plugin_util.cc
+++ b/chrome/common/chrome_plugin_util.cc
@@ -138,6 +138,14 @@ CPError CPB_GetCommandLineArgumentsCommon(const char* url,
     }
   }
 
+#if defined (OS_CHROMEOS)
+  std::wstring profile = cmd.GetSwitchValue(switches::kProfile);
+  if (!profile.empty()) {
+    arguments_w += std::wstring(L"--") + ASCIIToWide(switches::kProfile) +
+                   L"=\"" + profile + L"\" ";
+  }
+#endif
+
   // Use '--app=url' instead of just 'url' to launch the browser with minimal
   // chrome.
   // Note: Do not change this flag!  Old Gears shortcuts will break if you do!
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 9b310bc..07efb297 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -443,6 +443,11 @@ const char kProcessPerSite[]                = "process-per-site";
 // script connections to each other).
 const char kProcessPerTab[]                 = "process-per-tab";
 
+#if defined(OS_CHROMEOS)
+// Overrides the Default profile.
+const char kProfile[]                       = "profile";
+#endif
+
 // Causes the process to run as a profile import subprocess.
 const char kProfileImportProcess[]          = "profile-import";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 2162976..e21d56fe 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -188,6 +188,7 @@ extern const char kZygoteProcess[];
 extern const char kCookiePipe[];
 extern const char kEnableGView[];
 extern const char kTestLoadLibcros[];
+extern const char kProfile[];
 #endif
 
 #if defined(OS_LINUX)
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 702ddc2..40b5e0b 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -15,16 +15,6 @@ const wchar_t kHomePageIsNewTabPage[] = L"homepage_is_newtabpage";
 // This is the URL of the page to load when opening new tabs.
 const wchar_t kHomePage[] = L"homepage";
 
-// This is the human-readable name of the current profile.
-const wchar_t kProfileName[] = L"profile.name";
-
-// This is the abbreviated human-readable name of the current profile
-const wchar_t kProfileNickname[] = L"profile.nickname";
-
-// This is a short, preferably human-readable ID for the current profile.
-// Its value should be unique within the current user data directory.
-const wchar_t kProfileID[] = L"profile.id";
-
 // Used to determine if the last session exited cleanly. Set to false when
 // first opened, and to true when closing. On startup if the value is false,
 // it means the profile didn't exit cleanly.
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 0a5f182..4b107e7 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -14,9 +14,6 @@ namespace prefs {
 // Profile prefs
 extern const wchar_t kHomePageIsNewTabPage[];
 extern const wchar_t kHomePage[];
-extern const wchar_t kProfileName[];
-extern const wchar_t kProfileNickname[];
-extern const wchar_t kProfileID[];
 extern const wchar_t kSessionExitedCleanly[];
 extern const wchar_t kRestoreOnStartup[];
 extern const wchar_t kURLsToRestoreOnStartup[];