Changed ChromeOS status bar menu handlers to obey --enable-tabbed-options swi...

chrome/browser/browser.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_BROWSER_H_
 #define CHROME_BROWSER_BROWSER_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 502 matching lines @@
 
   void ToggleBookmarkBar();
 
   void OpenBookmarkManager();
   void ShowAppMenu();
   void ShowBookmarkManagerTab();
   void ShowHistoryTab();
   void ShowDownloadsTab();
   void ShowExtensionsTab();
   void ShowBrokenPageTab(TabContents* contents);
-  void ShowOptionsTab();
+  void ShowOptionsTab(const char* sub_page);
   void OpenClearBrowsingDataDialog();
   void OpenOptionsDialog();
   void OpenKeywordEditor();
   void OpenPasswordManager();
   void OpenSyncMyBookmarksDialog();
 #if defined(ENABLE_REMOTING)
   void OpenRemotingSetupDialog();
 #endif
   void OpenImportSettingsDialog();
   void OpenAboutChromeDialog();
   void OpenUpdateChromeDialog();
   void OpenHelpTab();
   // Used by the "Get themes" link in the options dialog.
   void OpenThemeGalleryTabAndActivate();
   void OpenAutoFillHelpTabAndActivate();
   void OpenPrivacyDashboardTabAndActivate();
+  void OpenSearchEngineOptionsDialog();
 #if defined(OS_CHROMEOS)
+  void OpenInternetOptionsDialog();
+  void OpenLanguageOptionsDialog();
   void OpenSystemOptionsDialog();
-  void OpenInternetOptionsDialog();
 #endif
 
   virtual void UpdateDownloadShelfVisibility(bool visible);
 
   // Overridden from TabStripModelDelegate:
   virtual bool UseVerticalTabs() const;
 
   /////////////////////////////////////////////////////////////////////////////
 
   // Sets the value of homepage related prefs to new values. Since we do not
@@ skipping 526 matching lines @@
   mutable BooleanPrefMember use_vertical_tabs_;
 
   // The profile's tab restore service. The service is owned by the profile,
   // and we install ourselves as an observer.
   TabRestoreService* tab_restore_service_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_H_