Change status button menu implementation from Menu2 to MenuItemView.

chrome/browser/chromeos/status/clock_menu_button.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 "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/window/window.h"
+
+using views::MenuItemView;

[oshima, 2011/04/08 17:21:17]

move this nito chromeos namespace.

[rhashimoto, 2011/04/14 00:58:54]

The using declaration or the anonymous namespace contents?  If the latter, then
it's done.

+
+namespace {
+
+// MenuItemView item ids
+enum {
+  CLOCK_DISPLAY_ITEM,
+  CLOCK_OPEN_OPTIONS_ITEM,
+};
+
+} // anonymous namespace

[oshima, 2011/04/08 17:21:17]

two space before //
just "namespace"

[rhashimoto, 2011/04/14 00:58:54]

Done.

 
 namespace chromeos {
 
 // 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
@@ skipping 47 matching lines @@
 }
 
 void ClockMenuButton::UpdateText() {
   base::Time time(base::Time::Now());
   SetText(UTF16ToWide(base::TimeFormatTimeOfDay(time)));
   SetTooltipText(UTF16ToWide(base::TimeFormatShortDate(time)));
   SchedulePaint();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// ClockMenuButton, ui::MenuModel implementation:
+// ClockMenuButton, views::MenuDelegate implementation:
+std::wstring ClockMenuButton::GetLabel(int id) const
+{
+  string16 label;
+  switch (id) {
+    case CLOCK_DISPLAY_ITEM:
+      label = base::TimeFormatFriendlyDate(base::Time::Now());
+      break;

[oshima, 2011/04/08 17:21:17]

just use if
I assume else case shouldn't happen? If so, add log/DCHECK

[rhashimoto, 2011/04/14 00:58:54]

Done.

+  }
 
-int ClockMenuButton::GetItemCount() const {
-  // If options dialog is unavailable, don't count a separator and configure
-  // menu item.
-  return host_->ShouldOpenButtonOptions(this) ? 3 : 1;
+  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
+{
+  switch (id) {
+    case CLOCK_DISPLAY_ITEM:
+      return false;

[oshima, 2011/04/08 17:21:17]

same here.

[rhashimoto, 2011/04/14 00:58:54]

This one is disabled only for CLOCK_DISPLAY_ITEM.  I changed it to if-else.

+    default:
+      return true;
+  }
 }
 
-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) {
-  host_->OpenButtonOptions(this);
+void ClockMenuButton::ExecuteCommand(int id)
+{
+  switch (id)
+  {
+    case CLOCK_OPEN_OPTIONS_ITEM:
+      host_->OpenButtonOptions(this);

[oshima, 2011/04/08 17:21:17]

same here

[rhashimoto, 2011/04/14 00:58:54]

Done.

+      break;
+  }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // 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);
+  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));
+    }
+  }
+
+  gfx::Point screen_loc;
+  views::View::ConvertPointToScreen(source, &screen_loc);
+  gfx::Rect bounds(screen_loc, source->size());

[oshima, 2011/04/08 17:21:17]

will RTL work with this?

[rhashimoto, 2011/04/14 00:58:54]

I don't know, but this is how the WrenchMenu is implemented with MenuItemView.

+  menu_->RunMenuAt(
+      source->GetWindow()->GetNativeWindow(),
+      this,
+      bounds,
+      base::i18n::IsRTL() ? MenuItemView::TOPLEFT : MenuItemView::TOPRIGHT,
+      true);
 }
 
 }  // namespace chromeos