summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-14 11:28:08 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-14 11:28:08 +0000
commitafb58615e49f5720dd78c69498b5b47590dda820 (patch)
treeb4efd82fec8821374b841c09eb06b71e1b08e4e8
parenta807bbeaaf2155a346ac946aefeed14620dbc17c (diff)
downloadchromium_src-afb58615e49f5720dd78c69498b5b47590dda820.zip
chromium_src-afb58615e49f5720dd78c69498b5b47590dda820.tar.gz
chromium_src-afb58615e49f5720dd78c69498b5b47590dda820.tar.bz2
Open the languages dialog, rather than the system option.
TEST=manually BUG=crosbug.com/2137 Review URL: http://codereview.chromium.org/1640010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44471 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/frame/browser_view.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc
index a9ac66d..bf822aa 100644
--- a/chrome/browser/chromeos/frame/browser_view.cc
+++ b/chrome/browser/chromeos/frame/browser_view.cc
@@ -13,7 +13,9 @@
#include "chrome/browser/chromeos/compact_location_bar_host.h"
#include "chrome/browser/chromeos/compact_navigation_bar.h"
#include "chrome/browser/chromeos/frame/panel_browser_view.h"
+#include "chrome/browser/chromeos/options/language_config_view.h"
#include "chrome/browser/chromeos/status/browser_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"
@@ -481,10 +483,13 @@ bool BrowserView::ShouldOpenButtonOptions(
}
void BrowserView::OpenButtonOptions(const views::View* button_view) const {
- if (button_view == status_area_->network_view())
+ if (button_view == status_area_->network_view()) {
browser()->OpenInternetOptionsDialog();
- else
+ } else if (button_view == status_area_->language_view()) {
+ LanguageConfigView::Show(GetProfile());
+ } else {
browser()->OpenSystemOptionsDialog();
+ }
}
bool BrowserView::IsButtonVisible(const views::View* button_view) const {