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

chrome/browser/chromeos/frame/browser_view.cc

 // 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.
 
 #include "chrome/browser/chromeos/frame/browser_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "app/menus/simple_menu_model.h"
 #include "base/command_line.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/chromeos/frame/panel_browser_view.h"
-#include "chrome/browser/chromeos/options/language_config_view.h"
 #include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/chromeos/status/language_menu_button.h"
 #include "chrome/browser/chromeos/status/network_menu_button.h"
 #include "chrome/browser/chromeos/status/status_area_button.h"
 #include "chrome/browser/chromeos/view_ids.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/views/app_launcher.h"
 #include "chrome/browser/views/frame/browser_frame_gtk.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/frame/browser_view_layout.h"
@@ skipping 351 matching lines @@
 }
 
 void BrowserView::ExecuteBrowserCommand(int id) const {
   browser()->ExecuteCommand(id);
 }
 
 void BrowserView::OpenButtonOptions(const views::View* button_view) const {
   if (button_view == status_area_->network_view()) {
     browser()->OpenInternetOptionsDialog();
   } else if (button_view == status_area_->language_view()) {
-    LanguageConfigView::Show(GetProfile(),
-                             frame()->GetWindow()->GetNativeWindow());
+    browser()->OpenLanguageOptionsDialog();
   } else {
     browser()->OpenSystemOptionsDialog();
   }
 }
 
 bool BrowserView::IsBrowserMode() const {
   return true;
 }
 
 bool BrowserView::IsScreenLockerMode() const {
@@ skipping 38 matching lines @@
   BrowserView* view;
   if ((browser->type() == Browser::TYPE_POPUP) ||
       (browser->type() == Browser::TYPE_APP_POPUP) ||
       (browser->type() == Browser::TYPE_APP_PANEL))
     view = new chromeos::PanelBrowserView(browser);
   else
     view = new chromeos::BrowserView(browser);
   BrowserFrame::Create(view, browser->profile());
   return view;
 }