Implement "Language Switcher" for Chromium OS.

chrome/browser/chromeos/status_area_view.cc

 // Copyright (c) 2009 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/status_area_view.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/theme_provider.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/chromeos/clock_menu_button.h"
+#include "chrome/browser/chromeos/language_menu_button.h"
 #include "chrome/browser/chromeos/network_menu_button.h"
 #include "chrome/browser/chromeos/power_menu_button.h"
 #include "chrome/browser/chromeos/status_area_button.h"
 #if !defined(TOOLKIT_VIEWS)
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #else
 #include "chrome/browser/views/frame/browser_view.h"
 #endif
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/controls/menu/menu.h"
 #include "views/controls/menu/menu_2.h"
 
 namespace chromeos {
 
 // Number of pixels to pad on the left border.
 const int kLeftBorder = 1;
 // Number of pixels to separate the clock from the next item on the right.
 const int kClockSeparation = 4;
+// Number of pixels to separate the language selector from the next item
+// on the right.
+const int kLanguageSeparation = 4;
 
 // BrowserWindowGtk tiles its image with this offset
 const int kCustomFrameBackgroundVerticalOffset = 15;
 
 class OptionsMenuModel : public menus::SimpleMenuModel,
                          public menus::SimpleMenuModel::Delegate {
  public:
   // These extra command IDs must be unique when combined with the options,
   // so we just pick up the numbering where that stops.
   enum OtherCommands {
@@ skipping 69 matching lines @@
 
 // Default to opening new tabs on the left.
 StatusAreaView::OpenTabsMode StatusAreaView::open_tabs_mode_ =
     StatusAreaView::OPEN_TABS_ON_LEFT;
 
 StatusAreaView::StatusAreaView(Browser* browser,
                                gfx::NativeWindow window)
     : browser_(browser),
       window_(window),
       clock_view_(NULL),
+      language_view_(NULL),
       network_view_(NULL),
       battery_view_(NULL),
       menu_view_(NULL) {
 }
 
 void StatusAreaView::Init() {
   ThemeProvider* theme = browser_->profile()->GetThemeProvider();
 
+  // Language.
+  language_view_ = new LanguageMenuButton(browser_);
+  AddChildView(language_view_);
+
   // Clock.
   clock_view_ = new ClockMenuButton(browser_);
   AddChildView(clock_view_);
 
   // Battery.
   battery_view_ = new PowerMenuButton();
   AddChildView(battery_view_);
 
   // Network.
   network_view_ = new NetworkMenuButton(window_);
@@ skipping 10 matching lines @@
   // We only turn on/off the menu for views because
   // gtk version will not hide the toolbar in compact
   // navigation bar mode.
   menu_view_->SetVisible(
       !browser_->window()->IsToolbarVisible());
 #endif
 }
 
 gfx::Size StatusAreaView::GetPreferredSize() {
   // Start with padding.
-  int result_w = kLeftBorder + kClockSeparation;
+  int result_w = kLeftBorder + kClockSeparation + kLanguageSeparation;
   int result_h = 0;
   for (int i = 0; i < GetChildViewCount(); i++) {
     views::View* cur = GetChildViewAt(i);
     if (cur->IsVisible()) {
       gfx::Size cur_size = cur->GetPreferredSize();
       // Add each width.
       result_w += cur_size.width();
       // Use max height.
       result_h = std::max(result_h, cur_size.height());
     }
@@ skipping 10 matching lines @@
       int cur_y = (height() - cur_size.height()) / 2;
 
       // Handle odd number of pixels.
       cur_y += (height() - cur_size.height()) % 2;
 
       // Put next in row horizontally, and center vertically.
       cur->SetBounds(cur_x, cur_y, cur_size.width(), cur_size.height());
 
       cur_x += cur_size.width();
 
-      // Buttons have built in padding, but clock doesn't.
+      // Buttons have built in padding, but clock and language status don't.
       if (cur == clock_view_)
         cur_x += kClockSeparation;
+      else if (cur == language_view_)
+        cur_x += kLanguageSeparation;
     }
   }
 }
 
 void StatusAreaView::Paint(gfx::Canvas* canvas) {
   ThemeProvider* theme = browser_->profile()->GetThemeProvider();
 
   // Fill the background.
   int image_name;
   if (browser_->window()->IsActive()) {
@@ skipping 87 matching lines @@
 void StatusAreaView::ExecuteCommand(int command_id) {
   browser_->ExecuteCommand(command_id);
 }
 
 void StatusAreaView::RunMenu(views::View* source, const gfx::Point& pt) {
   CreateAppMenu();
   app_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
 }
 
 }  // namespace chromeos