Change status button menu implementation from Menu2 to MenuItemView.

chrome/browser/chromeos/status/clock_menu_button.cc

 // Copyright (c) 2011 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/clock_menu_button.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/status/status_area_host.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
+#include "views/widget/widget.h"
+#include "views/window/window.h"
 
-namespace chromeos {
+using views::MenuItemView;
+
+namespace {
+
+// MenuItemView item ids
+enum {
+  CLOCK_DISPLAY_ITEM,
+  CLOCK_OPEN_OPTIONS_ITEM,
+};
 
 // Amount of slop to add into the timer to make sure we're into the next minute
 // when the timer goes off.
 const int kTimerSlopSeconds = 1;
 
 #if defined(CROS_FONTS_USING_BCI)
 const int kFontSizeDelta = 0;
 #else
 const int kFontSizeDelta = 1;
 #endif
 
+}  // namespace
+
+namespace chromeos {
+
 ClockMenuButton::ClockMenuButton(StatusAreaHost* host)
     : StatusAreaButton(this),
       host_(host) {
   // Add as SystemLibrary observer. We update the clock if timezone changes.
   CrosLibrary::Get()->GetSystemLibrary()->AddObserver(this);
   CrosLibrary::Get()->GetPowerLibrary()->AddObserver(this);
   // Start monitoring the kUse24HourClock preference.
   if (host->GetProfile()) {  // This can be NULL in the login screen.
     registrar_.Init(host->GetProfile()->GetPrefs());
     registrar_.Add(prefs::kUse24HourClock, this);
@@ skipping 62 matching lines @@
                               const NotificationSource& source,
                               const NotificationDetails& details) {
   if (type == NotificationType::PREF_CHANGED) {
     std::string* pref_name = Details<std::string>(details).ptr();
     if (*pref_name == prefs::kUse24HourClock) {
       UpdateText();
     }
   }
 }
 
-
-////////////////////////////////////////////////////////////////////////////////
-// ClockMenuButton, ui::MenuModel implementation:
-
-int ClockMenuButton::GetItemCount() const {
-  // If options dialog is unavailable, don't count a separator and configure
-  // menu item.
-  return host_->ShouldOpenButtonOptions(this) ? 3 : 1;
+// ClockMenuButton, views::MenuDelegate implementation:
+std::wstring ClockMenuButton::GetLabel(int id) const
+{

[oshima, 2011/04/15 17:40:12]

move { to pervious line. (and other places)

[rhashimoto, 2011/04/15 21:20:27]

Done.

+  DCHECK_EQ(CLOCK_DISPLAY_ITEM,id);

[oshima, 2011/04/15 17:40:12]

space after ,

[rhashimoto, 2011/04/15 21:20:27]

Done.

+  const string16 label = base::TimeFormatFriendlyDate(base::Time::Now());
+  return UTF16ToWide(label);
 }
 
-ui::MenuModel::ItemType ClockMenuButton::GetTypeAt(int index) const {
-  // There's a separator between the current date and the menu item to open
-  // the options menu.
-  return index == 1 ? ui::MenuModel::TYPE_SEPARATOR:
-                      ui::MenuModel::TYPE_COMMAND;
+bool ClockMenuButton::IsCommandEnabled(int id) const
+{
+  DCHECK(id == CLOCK_DISPLAY_ITEM || id == CLOCK_OPEN_OPTIONS_ITEM);
+  return id == CLOCK_OPEN_OPTIONS_ITEM;
 }
 
-string16 ClockMenuButton::GetLabelAt(int index) const {
-  if (index == 0)
-    return base::TimeFormatFriendlyDate(base::Time::Now());
-  return l10n_util::GetStringUTF16(IDS_STATUSBAR_CLOCK_OPEN_OPTIONS_DIALOG);
-}
-
-bool ClockMenuButton::IsEnabledAt(int index) const {
-  // The 1st item is the current date, which is disabled.
-  return index != 0;
-}
-
-void ClockMenuButton::ActivatedAt(int index) {
+void ClockMenuButton::ExecuteCommand(int id)
+{
+  DCHECK_EQ(CLOCK_OPEN_OPTIONS_ITEM,id);
   host_->OpenButtonOptions(this);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ClockMenuButton, PowerLibrary::Observer implementation:
 
 void ClockMenuButton::SystemResumed() {
   UpdateText();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ClockMenuButton, SystemLibrary::Observer implementation:
 
 void ClockMenuButton::TimezoneChanged(const icu::TimeZone& timezone) {
   UpdateText();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ClockMenuButton, views::ViewMenuDelegate implementation:
 
 void ClockMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
-  if (!clock_menu_.get())
-    clock_menu_.reset(new views::Menu2(this));
-  else
-    clock_menu_->Rebuild();
-  clock_menu_->UpdateStates();
-  clock_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
+  // View passed in must be a views::MenuButton, i.e. the ClockMenuButton.
+  DCHECK_EQ(source,this);
+
+  EnsureMenu();
+
+  // TODO(rhashimoto): Remove this workaround when WebUI provides a
+  // top-level widget on the ChromeOS login screen that is a window.
+  // The current BackgroundView class for the ChromeOS login screen
+  // creates a owning Widget that has a native GtkWindow but is not a
+  // Window.  This makes it impossible to get the NativeWindow via
+  // the views API.  This workaround casts the top-level NativeWidget
+  // to a NativeWindow that we can pass to MenuItemView::RunMenuAt().
+  gfx::NativeWindow window;
+  if (source->GetWindow()) {
+    // This is the normal case with a browser.
+    window = source->GetWindow()->GetNativeWindow();
+  } else {
+#if defined(OS_WIN)
+    NOTREACHED();
+#elif defined(USE_X11)
+    window = GTK_WINDOW(source->GetWidget()->GetNativeView());
+#endif
+  }
+
+  gfx::Point screen_loc;
+  views::View::ConvertPointToScreen(source, &screen_loc);
+  gfx::Rect bounds(screen_loc, source->size());
+  menu_->RunMenuAt(
+      window,
+      this,
+      bounds,
+      base::i18n::IsRTL() ? MenuItemView::TOPLEFT : MenuItemView::TOPRIGHT,
+      true);
 }

[oshima, 2011/04/15 17:40:12]

Looks like we can move this to StatusAreaButton (assuming all status area button
has a menu). Window switcher button is currently StatusAreaButton, but this does
not seem to be necessary. What do you think?

[rhashimoto, 2011/04/15 21:20:27]

If we were going to consolidate it, I think I'd put it on MenuButton (the
superclass of StatusAreaButton).  I'd rather put that refactoring in a separate
CL, though, because otherwise I'd have to put all the other menus that need
conversion to MenuItemView in this CL.

[oshima, 2011/04/15 22:35:18]

sgtm

 
 ////////////////////////////////////////////////////////////////////////////////
 // ClockMenuButton, views::View implementation:
 
 void ClockMenuButton::OnLocaleChanged() {
   UpdateText();
 }
 
+void ClockMenuButton::EnsureMenu()
+{
+  if (!menu_.get()) {
+    menu_.reset(new MenuItemView(this));
+
+    // Text for this item will be set by GetLabel().
+    menu_->AppendDelegateMenuItem(CLOCK_DISPLAY_ITEM);
+
+    // If options dialog is unavailable, don't count a separator and configure
+    // menu item.
+    if (host_->ShouldOpenButtonOptions(this)) {
+      menu_->AppendSeparator();
+
+      const string16 clock_open_options_label =
+          l10n_util::GetStringUTF16(IDS_STATUSBAR_CLOCK_OPEN_OPTIONS_DIALOG);
+      menu_->AppendMenuItemWithLabel(
+          CLOCK_OPEN_OPTIONS_ITEM,
+          UTF16ToWide(clock_open_options_label));
+    }
+  }
+}
+
 }  // namespace chromeos