fixes for

 crash/non responsive issue in compact navbar.
 crash when adding tab.

new command line switch to start chrome in chromeos layout.
changed accelerator to toggle compact navbar to ctrl-shit-c.
-0 does not work on chromeos for some reason.

BUG=chromium-os:1010, 30612
TEST=None

Review URL: http://codereview.chromium.org/500043

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34791 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 5 deletions

diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 64ab2ee..9c6dcb8 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -449,11 +449,6 @@ 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";
 
@@ -681,6 +676,12 @@ const char kLoginManager[]                  = "login-manager";
 // Attempts to load libcros and validate it, then exits. A nonzero return code
 // means the library could not be loaded correctly.
 const char kTestLoadLibcros[]               = "test-load-libcros";
+
+// Overrides the Default profile.
+const char kProfile[]                       = "profile";
+
+// Use the frame layout used in chromeos.
+const char kChromeosFrame[]                 = "chromeos-frame";
 #endif
 
 #if defined(OS_LINUX)