4 files changed, 17 insertions, 3 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index b53d083..6cb475f 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -453,7 +453,7 @@ bool BrowserInit::LaunchWithProfile::Launch(Profile* profile,
       OpenURLsInBrowser(browser, process_startup, urls_to_open);
     }
     // Check whether we are the default browser.
-    if (process_startup &&
+    if (process_startup && browser_defaults::kOSSupportsOtherBrowsers &&
         !command_line_.HasSwitch(switches::kNoDefaultBrowserCheck))
       CheckDefaultBrowser(profile);
   } else {
diff --git a/chrome/browser/defaults.cc b/chrome/browser/defaults.cc
index fdc261a..2586bc2 100644
--- a/chrome/browser/defaults.cc
+++ b/chrome/browser/defaults.cc
@@ -17,6 +17,8 @@ const SessionStartupPref::Type kDefaultSessionStartupType =
 const int kPinnedTabWidth = 64;
 const bool kCanToggleSystemTitleBar = false;
 const bool kRestorePopups = true;
+const bool kShowExitMenuItem = false;
+const bool kOSSupportsOtherBrowsers = false;
 
 #elif defined(OS_LINUX)
 
@@ -44,6 +46,8 @@ const SessionStartupPref::Type kDefaultSessionStartupType =
     SessionStartupPref::DEFAULT;
 const int kPinnedTabWidth = 56;
 const bool kRestorePopups = false;
+const bool kShowExitMenuItem = true;
+const bool kOSSupportsOtherBrowsers = true;
 
 #endif
 
diff --git a/chrome/browser/defaults.h b/chrome/browser/defaults.h
index a701fa2..3ba67d5 100644
--- a/chrome/browser/defaults.h
+++ b/chrome/browser/defaults.h
@@ -40,6 +40,13 @@ extern const bool kRestorePopups;
 // Can the browser be alive without any browser windows?
 extern const bool kBrowserAliveWithNoWindows;
 
+// Should the exit menu be shown?
+extern const bool kShowExitMenuItem;
+
+// Does the OS support other browsers? If not, operations such as default
+// browser check are not done.
+extern const bool kOSSupportsOtherBrowsers;
+
 }  // namespace browser_defaults
 
 #endif  // CHROME_BROWSER_DEFAULTS_H_
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 0929342..736b1ee 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -23,6 +23,7 @@
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/character_encoding.h"
+#include "chrome/browser/defaults.h"
 #include "chrome/browser/encoding_menu_controller.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
@@ -1202,8 +1203,10 @@ void ToolbarView::CreateAppMenu() {
                                   IDS_ABOUT,
                                   l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
-  app_menu_contents_->AddSeparator();
-  app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT);
+  if (browser_defaults::kShowExitMenuItem) {
+    app_menu_contents_->AddSeparator();
+    app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT);
+  }
 
   app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get()));
 }