diff options
48 files changed, 140 insertions, 141 deletions
diff --git a/chrome/browser/chromeos/login/language_switch_menu.cc b/chrome/browser/chromeos/login/language_switch_menu.cc index 16acbd9..63ee452 100644 --- a/chrome/browser/chromeos/login/language_switch_menu.cc +++ b/chrome/browser/chromeos/login/language_switch_menu.cc @@ -190,7 +190,7 @@ void LanguageSwitchMenu::SwitchLanguageAndEnableKeyboardLayouts( } //////////////////////////////////////////////////////////////////////////////// -// views::ViewMenuDelegate implementation. +// views::MenuButtonDelegate implementation. void LanguageSwitchMenu::RunMenu(views::View* source, const gfx::Point& pt) { DCHECK(menu_ != NULL); diff --git a/chrome/browser/chromeos/login/language_switch_menu.h b/chrome/browser/chromeos/login/language_switch_menu.h index d11a2ad..2619833 100644 --- a/chrome/browser/chromeos/login/language_switch_menu.h +++ b/chrome/browser/chromeos/login/language_switch_menu.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -10,8 +10,8 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" +#include "ui/views/controls/button/menu_button_delegate.h" #include "ui/views/controls/menu/menu_delegate.h" -#include "ui/views/controls/menu/view_menu_delegate.h" #include "ui/views/view.h" class WizardControllerTest_SwitchLanguage_Test; @@ -25,7 +25,7 @@ namespace chromeos { class LanguageList; -class LanguageSwitchMenu : public views::ViewMenuDelegate, +class LanguageSwitchMenu : public views::MenuButtonDelegate, public views::MenuDelegate { public: LanguageSwitchMenu(); @@ -52,7 +52,7 @@ class LanguageSwitchMenu : public views::ViewMenuDelegate, private: static void LoadFontsForCurrentLocale(); - // views::ViewMenuDelegate implementation. + // views::MenuButtonDelegate implementation. virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE; // views::MenuDelegate implementation. diff --git a/chrome/browser/chromeos/notifications/balloon_view.cc b/chrome/browser/chromeos/notifications/balloon_view.cc index e449149..3d4b0b9 100644 --- a/chrome/browser/chromeos/notifications/balloon_view.cc +++ b/chrome/browser/chromeos/notifications/balloon_view.cc @@ -34,11 +34,11 @@ #include "ui/views/controls/button/button.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/button/menu_button.h" +#include "ui/views/controls/button/menu_button_delegate.h" #include "ui/views/controls/label.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_model_adapter.h" #include "ui/views/controls/menu/menu_runner.h" -#include "ui/views/controls/menu/view_menu_delegate.h" #include "ui/views/widget/widget.h" using content::RenderWidgetHostView; @@ -61,7 +61,7 @@ namespace chromeos { // NotificationControlView has close and menu buttons and // overlays on top of renderer view. class NotificationControlView : public views::View, - public views::ViewMenuDelegate, + public views::MenuButtonDelegate, public ui::SimpleMenuModel::Delegate, public views::ButtonListener { public: @@ -121,7 +121,7 @@ class NotificationControlView : public views::View, return total_bounds.size(); } - // views::ViewMenuDelegate implements. + // views::MenuButtonDelegate implements. virtual void RunMenu(views::View* source, const gfx::Point& pt) { CreateOptionsMenu(); diff --git a/chrome/browser/chromeos/status/accessibility_menu_button.cc b/chrome/browser/chromeos/status/accessibility_menu_button.cc index 7aeb4c4..4f71da9 100644 --- a/chrome/browser/chromeos/status/accessibility_menu_button.cc +++ b/chrome/browser/chromeos/status/accessibility_menu_button.cc @@ -52,7 +52,7 @@ AccessibilityMenuButton::~AccessibilityMenuButton() { } //////////////////////////////////////////////////////////////////////////////// -// views::ViewMenuDelegate implementation: +// views::MenuButtonDelegate implementation: void AccessibilityMenuButton::RunMenu(views::View* source, const gfx::Point& pt) { diff --git a/chrome/browser/chromeos/status/accessibility_menu_button.h b/chrome/browser/chromeos/status/accessibility_menu_button.h index 0ce8ccd..32445c9 100644 --- a/chrome/browser/chromeos/status/accessibility_menu_button.h +++ b/chrome/browser/chromeos/status/accessibility_menu_button.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -9,8 +9,8 @@ #include "chrome/browser/chromeos/status/status_area_button.h" #include "chrome/browser/prefs/pref_member.h" #include "content/public/browser/notification_observer.h" +#include "ui/views/controls/button/menu_button_delegate.h" #include "ui/views/controls/menu/menu_delegate.h" -#include "ui/views/controls/menu/view_menu_delegate.h" namespace views { class MenuRunner; @@ -23,14 +23,14 @@ class StatusAreaBubbleController; // A class for the button in the status area which alerts the user when // accessibility features are enabled. class AccessibilityMenuButton : public StatusAreaButton, - public views::ViewMenuDelegate, + public views::MenuButtonDelegate, public views::MenuDelegate, public content::NotificationObserver { public: explicit AccessibilityMenuButton(StatusAreaButton::Delegate* delegate); virtual ~AccessibilityMenuButton(); - // views::ViewMenuDelegate implementation + // views::MenuButtonDelegate implementation virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE; // views::MenuDelegate implementation diff --git a/chrome/browser/chromeos/status/caps_lock_menu_button.cc b/chrome/browser/chromeos/status/caps_lock_menu_button.cc index 73d6a3e..075dc4f 100644 --- a/chrome/browser/chromeos/status/caps_lock_menu_button.cc +++ b/chrome/browser/chromeos/status/caps_lock_menu_button.cc @@ -104,7 +104,7 @@ string16 CapsLockMenuButton::GetLabel(int id) const { } //////////////////////////////////////////////////////////////////////////////// -// views::ViewMenuDelegate implementation: +// views::MenuButtonDelegate implementation: void CapsLockMenuButton::RunMenu(views::View* source, const gfx::Point& pt) { static const int kDummyCommandId = 1000; diff --git a/chrome/browser/chromeos/status/caps_lock_menu_button.h b/chrome/browser/chromeos/status/caps_lock_menu_button.h index 20ff514..7246188 100644 --- a/chrome/browser/chromeos/status/caps_lock_menu_button.h +++ b/chrome/browser/chromeos/status/caps_lock_menu_button.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -14,8 +14,8 @@ #include "chrome/browser/chromeos/system_key_event_listener.h" #include "chrome/browser/prefs/pref_member.h" #include "content/public/browser/notification_observer.h" +#include "ui/views/controls/button/menu_button_delegate.h" #include "ui/views/controls/menu/menu_delegate.h" -#include "ui/views/controls/menu/view_menu_delegate.h" class Bubble; @@ -33,7 +33,7 @@ class StatusAreaBubbleController; class CapsLockMenuButton : public content::NotificationObserver, public StatusAreaButton, public views::MenuDelegate, - public views::ViewMenuDelegate, + public views::MenuButtonDelegate, public SystemKeyEventListener::CapsLockObserver { public: explicit CapsLockMenuButton(StatusAreaButton::Delegate* delegate); @@ -45,7 +45,7 @@ class CapsLockMenuButton : public content::NotificationObserver, // views::MenuDelegate implementation. virtual string16 GetLabel(int id) const OVERRIDE; - // views::ViewMenuDelegate implementation. + // views::MenuButtonDelegate implementation. virtual void RunMenu(views::View* unused_source, const gfx::Point& pt) OVERRIDE; diff --git a/chrome/browser/chromeos/status/clock_menu_button.cc b/chrome/browser/chromeos/status/clock_menu_button.cc index 56f4e015..a5f240f 100644 --- a/chrome/browser/chromeos/status/clock_menu_button.cc +++ b/chrome/browser/chromeos/status/clock_menu_button.cc @@ -160,7 +160,7 @@ int ClockMenuButton::horizontal_padding() { return 3; } -// ClockMenuButton, views::ViewMenuDelegate implementation: +// ClockMenuButton, views::MenuButtonDelegate implementation: void ClockMenuButton::RunMenu(views::View* source, const gfx::Point& pt) { // View passed in must be a views::MenuButton, i.e. the ClockMenuButton. diff --git a/chrome/browser/chromeos/status/clock_menu_button.h b/chrome/browser/chromeos/status/clock_menu_button.h index 9051f0a..9ca9893 100644 --- a/chrome/browser/chromeos/status/clock_menu_button.h +++ b/chrome/browser/chromeos/status/clock_menu_button.h @@ -15,8 +15,8 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_types.h" #include "ui/views/controls/button/menu_button.h" +#include "ui/views/controls/button/menu_button_delegate.h" #include "ui/views/controls/menu/menu_delegate.h" -#include "ui/views/controls/menu/view_menu_delegate.h" #include "unicode/calendar.h" namespace views { @@ -27,7 +27,7 @@ class MenuRunner; // This button shows the current time. class ClockMenuButton : public StatusAreaButton, public views::MenuDelegate, - public views::ViewMenuDelegate, + public views::MenuButtonDelegate, public content::NotificationObserver { public: explicit ClockMenuButton(StatusAreaButton::Delegate* delegate); @@ -57,7 +57,7 @@ class ClockMenuButton : public StatusAreaButton, // views::View implementation virtual void OnLocaleChanged() OVERRIDE; - // views::ViewMenuDelegate implementation. + // views::MenuButtonDelegate implementation. virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE; private: diff --git a/chrome/browser/chromeos/status/input_method_menu.cc b/chrome/browser/chromeos/status/input_method_menu.cc index 5aed2e3..fe78900 100644 --- a/chrome/browser/chromeos/status/input_method_menu.cc +++ b/chrome/browser/chromeos/status/input_method_menu.cc @@ -385,7 +385,7 @@ void InputMethodMenu::ActivatedAt(int index) { } //////////////////////////////////////////////////////////////////////////////// -// views::ViewMenuDelegate implementation: +// views::MenuButtonDelegate implementation: void InputMethodMenu::RunMenu(views::View* source, const gfx::Point& pt) { PrepareForMenuOpen(); diff --git a/chrome/browser/chromeos/status/input_method_menu.h b/chrome/browser/chromeos/status/input_method_menu.h index da83646..37d5e4d 100644 --- a/chrome/browser/chromeos/status/input_method_menu.h +++ b/chrome/browser/chromeos/status/input_method_menu.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -15,8 +15,8 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_types.h" #include "ui/base/models/menu_model.h" +#include "ui/views/controls/button/menu_button_delegate.h" #include "ui/views/controls/menu/menu_item_view.h" -#include "ui/views/controls/menu/view_menu_delegate.h" class PrefService; class SkBitmap; @@ -34,11 +34,11 @@ class MenuRunner; namespace chromeos { // A class for the dropdown menu for switching input method and keyboard layout. -// Since the class provides the views::ViewMenuDelegate interface, it's easy to -// create a button widget (e.g. views::MenuButton, StatusAreaButton) -// which shows the dropdown menu on click. +// Since the class provides the views::MenuButtonDelegate interface, it's easy +// to create a button widget (e.g. views::MenuButton, StatusAreaButton) which +// shows the dropdown menu on click. class InputMethodMenu - : public views::ViewMenuDelegate, + : public views::MenuButtonDelegate, public ui::MenuModel, public input_method::InputMethodManager::Observer, public input_method::InputMethodManager::PreferenceObserver, @@ -69,8 +69,8 @@ class InputMethodMenu virtual void MenuWillShow() OVERRIDE; virtual void SetMenuModelDelegate(ui::MenuModelDelegate* delegate) OVERRIDE; - // views::ViewMenuDelegate implementation. Sub classes can override the method - // to adjust the position of the menu. + // views::MenuButtonDelegate implementation. Sub classes can override the + // method to adjust the position of the menu. virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE; // InputMethodManager::Observer implementation. diff --git a/chrome/browser/chromeos/status/input_method_menu_button.cc b/chrome/browser/chromeos/status/input_method_menu_button.cc index 47dd36c..ba17067 100644 --- a/chrome/browser/chromeos/status/input_method_menu_button.cc +++ b/chrome/browser/chromeos/status/input_method_menu_button.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -84,7 +84,7 @@ void InputMethodMenuButton::OnLocaleChanged() { } //////////////////////////////////////////////////////////////////////////////// -// views::ViewMenuDelegate implementation: +// views::MenuButtonDelegate implementation: void InputMethodMenuButton::RunMenu(views::View* unused_source, const gfx::Point& pt) { diff --git a/chrome/browser/chromeos/status/input_method_menu_button.h b/chrome/browser/chromeos/status/input_method_menu_button.h index 0808eda..84d9063 100644 --- a/chrome/browser/chromeos/status/input_method_menu_button.h +++ b/chrome/browser/chromeos/status/input_method_menu_button.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -11,14 +11,14 @@ #include "base/compiler_specific.h" #include "chrome/browser/chromeos/status/input_method_menu.h" #include "chrome/browser/chromeos/status/status_area_button.h" -#include "ui/views/controls/menu/view_menu_delegate.h" +#include "ui/views/controls/button/menu_button_delegate.h" namespace chromeos { // A class for the button in the status area which expands the dropdown menu for // switching input method and keyboard layout. class InputMethodMenuButton : public StatusAreaButton, - public views::ViewMenuDelegate { + public views::MenuButtonDelegate { public: explicit InputMethodMenuButton(StatusAreaButton::Delegate* delegate); virtual ~InputMethodMenuButton(); @@ -26,7 +26,7 @@ class InputMethodMenuButton : public StatusAreaButton, // views::View implementation. virtual void OnLocaleChanged() OVERRIDE; - // views::ViewMenuDelegate implementation. + // views::MenuButtonDelegate implementation. virtual void RunMenu(views::View* unused_source, const gfx::Point& pt) OVERRIDE; diff --git a/chrome/browser/chromeos/status/memory_menu_button.cc b/chrome/browser/chromeos/status/memory_menu_button.cc index 3a14554..f555e9a 100644 --- a/chrome/browser/chromeos/status/memory_menu_button.cc +++ b/chrome/browser/chromeos/status/memory_menu_button.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -218,7 +218,7 @@ int MemoryMenuButton::horizontal_padding() { return 3; } -// MemoryMenuButton, views::ViewMenuDelegate implementation: +// MemoryMenuButton, views::MenuButtonDelegate implementation: void MemoryMenuButton::RunMenu(views::View* source, const gfx::Point& pt) { // View passed in must be a views::MenuButton, i.e. the MemoryMenuButton. diff --git a/chrome/browser/chromeos/status/memory_menu_button.h b/chrome/browser/chromeos/status/memory_menu_button.h index d7ddf3d..f3bd944 100644 --- a/chrome/browser/chromeos/status/memory_menu_button.h +++ b/chrome/browser/chromeos/status/memory_menu_button.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -11,8 +11,8 @@ #include "chrome/browser/chromeos/status/status_area_button.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "ui/views/controls/button/menu_button_delegate.h" #include "ui/views/controls/menu/menu_delegate.h" -#include "ui/views/controls/menu/view_menu_delegate.h" namespace base { struct SystemMemoryInfoKB; @@ -26,7 +26,7 @@ class MenuRunner; // Memory debugging display that lives in the status area. class MemoryMenuButton : public StatusAreaButton, public views::MenuDelegate, - public views::ViewMenuDelegate, + public views::MenuButtonDelegate, public content::NotificationObserver { public: explicit MemoryMenuButton(StatusAreaButton::Delegate* delegate); @@ -37,7 +37,7 @@ class MemoryMenuButton : public StatusAreaButton, virtual bool IsCommandEnabled(int id) const OVERRIDE; virtual void ExecuteCommand(int id) OVERRIDE; - // views::ViewMenuDelegate implementation. + // views::MenuButtonDelegate implementation. virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE; // content::NotificationObserver overrides. diff --git a/chrome/browser/chromeos/status/network_menu.h b/chrome/browser/chromeos/status/network_menu.h index 9677d58..7a51879 100644 --- a/chrome/browser/chromeos/status/network_menu.h +++ b/chrome/browser/chromeos/status/network_menu.h @@ -13,7 +13,7 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/cros/network_library.h" // ConnectionType #include "ui/gfx/native_widget_types.h" // gfx::NativeWindow -#include "ui/views/controls/menu/view_menu_delegate.h" +#include "ui/views/controls/button/menu_button_delegate.h" namespace ui { class MenuModel; diff --git a/chrome/browser/chromeos/status/network_menu_button.cc b/chrome/browser/chromeos/status/network_menu_button.cc index 05c0872..d3b4feb 100644 --- a/chrome/browser/chromeos/status/network_menu_button.cc +++ b/chrome/browser/chromeos/status/network_menu_button.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -225,7 +225,7 @@ void NetworkMenuButton::OnLocaleChanged() { } //////////////////////////////////////////////////////////////////////////////// -// NetworkMenuButton, views::ViewMenuDelegate implementation: +// NetworkMenuButton, views::MenuButtonDelegate implementation: void NetworkMenuButton::RunMenu(views::View* source, const gfx::Point& pt) { network_menu_->RunMenu(source); } diff --git a/chrome/browser/chromeos/status/network_menu_button.h b/chrome/browser/chromeos/status/network_menu_button.h index eaaab09..0f7b88e 100644 --- a/chrome/browser/chromeos/status/network_menu_button.h +++ b/chrome/browser/chromeos/status/network_menu_button.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -46,7 +46,7 @@ namespace chromeos { // <icon> will show the strength of the wifi/cellular networks. // The label will be BOLD if the network is currently connected. class NetworkMenuButton : public StatusAreaButton, - public views::ViewMenuDelegate, + public views::MenuButtonDelegate, public NetworkMenu::Delegate, public NetworkMenuIcon::Delegate, public NetworkLibrary::NetworkDeviceObserver, @@ -87,7 +87,7 @@ class NetworkMenuButton : public StatusAreaButton, // views::View virtual void OnLocaleChanged() OVERRIDE; - // views::ViewMenuDelegate implementation. + // views::MenuButtonDelegate implementation. virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE; // views::Widget::Observer implementation: diff --git a/chrome/browser/chromeos/status/power_menu_button.cc b/chrome/browser/chromeos/status/power_menu_button.cc index 001a09c..9c716418 100644 --- a/chrome/browser/chromeos/status/power_menu_button.cc +++ b/chrome/browser/chromeos/status/power_menu_button.cc @@ -266,7 +266,7 @@ void PowerMenuButton::OnLocaleChanged() { } //////////////////////////////////////////////////////////////////////////////// -// PowerMenuButton, views::ViewMenuDelegate implementation: +// PowerMenuButton, views::MenuButtonDelegate implementation: void PowerMenuButton::RunMenu(views::View* source, const gfx::Point& pt) { // Explicitly query the power status. diff --git a/chrome/browser/chromeos/status/power_menu_button.h b/chrome/browser/chromeos/status/power_menu_button.h index c30c39c..f9eb604 100644 --- a/chrome/browser/chromeos/status/power_menu_button.h +++ b/chrome/browser/chromeos/status/power_menu_button.h @@ -9,8 +9,8 @@ #include "base/compiler_specific.h" #include "chrome/browser/chromeos/dbus/power_manager_client.h" #include "chrome/browser/chromeos/status/status_area_button.h" +#include "ui/views/controls/button/menu_button_delegate.h" #include "ui/views/controls/menu/menu_delegate.h" -#include "ui/views/controls/menu/view_menu_delegate.h" namespace base { class TimeDelta; @@ -28,7 +28,7 @@ class StatusAreaBubbleContentView; // This class will handle getting the power status and populating the menu. class PowerMenuButton : public StatusAreaButton, public views::MenuDelegate, - public views::ViewMenuDelegate, + public views::MenuButtonDelegate, public PowerManagerClient::Observer { public: explicit PowerMenuButton(StatusAreaButton::Delegate* delegate); @@ -45,7 +45,7 @@ class PowerMenuButton : public StatusAreaButton, // views::View virtual void OnLocaleChanged() OVERRIDE; - // views::ViewMenuDelegate implementation. + // views::MenuButtonDelegate implementation. virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE; // Format strings with power status diff --git a/chrome/browser/chromeos/status/status_area_button.cc b/chrome/browser/chromeos/status/status_area_button.cc index e0b9084..6bd832b 100644 --- a/chrome/browser/chromeos/status/status_area_button.cc +++ b/chrome/browser/chromeos/status/status_area_button.cc @@ -33,7 +33,7 @@ const int kIconHorizontalPad = 2; // StatusAreaButton StatusAreaButton::StatusAreaButton(Delegate* button_delegate, - views::ViewMenuDelegate* menu_delegate) + views::MenuButtonDelegate* menu_delegate) : MenuButton(NULL, string16(), menu_delegate, false), menu_active_(true), delegate_(button_delegate) { diff --git a/chrome/browser/chromeos/status/status_area_button.h b/chrome/browser/chromeos/status/status_area_button.h index 9e6041f..26207a3 100644 --- a/chrome/browser/chromeos/status/status_area_button.h +++ b/chrome/browser/chromeos/status/status_area_button.h @@ -10,7 +10,7 @@ #include "base/string16.h" #include "ui/gfx/font.h" #include "ui/views/controls/button/menu_button.h" -#include "ui/views/controls/menu/view_menu_delegate.h" +#include "ui/views/controls/button/menu_button_delegate.h" // Button to be used to represent status and allow menus to be popped up. // Shows current button state by drawing a border around the current icon. @@ -52,7 +52,7 @@ class StatusAreaButton : public views::MenuButton { }; StatusAreaButton(Delegate* button_delegate, - views::ViewMenuDelegate* menu_delegate); + views::MenuButtonDelegate* menu_delegate); virtual ~StatusAreaButton() {} virtual void PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) OVERRIDE; diff --git a/chrome/browser/chromeos/status/volume_menu_button.h b/chrome/browser/chromeos/status/volume_menu_button.h index 8b72da7..355eaec 100644 --- a/chrome/browser/chromeos/status/volume_menu_button.h +++ b/chrome/browser/chromeos/status/volume_menu_button.h @@ -9,15 +9,15 @@ #include "base/compiler_specific.h" #include "chrome/browser/chromeos/audio/audio_handler.h" #include "chrome/browser/chromeos/status/status_area_button.h" +#include "ui/views/controls/button/menu_button_delegate.h" #include "ui/views/controls/menu/menu_delegate.h" -#include "ui/views/controls/menu/view_menu_delegate.h" namespace chromeos { // The volume button in the status area. class VolumeMenuButton : public StatusAreaButton, public views::MenuDelegate, - public views::ViewMenuDelegate, + public views::MenuButtonDelegate, public AudioHandler::VolumeObserver { public: explicit VolumeMenuButton(StatusAreaButton::Delegate* delegate); @@ -34,7 +34,7 @@ class VolumeMenuButton : public StatusAreaButton, // views::View implementation. virtual void OnLocaleChanged() OVERRIDE; - // views::ViewMenuDelegate implementation. + // views::MenuButtonDelegate implementation. virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE; // AudioHandler::VolumeObserver implementation. diff --git a/chrome/browser/ui/panels/panel_browser_frame_view.h b/chrome/browser/ui/panels/panel_browser_frame_view.h index d80e9e9..412a812 100644 --- a/chrome/browser/ui/panels/panel_browser_frame_view.h +++ b/chrome/browser/ui/panels/panel_browser_frame_view.h @@ -13,7 +13,7 @@ #include "chrome/browser/ui/views/tab_icon_view.h" #include "ui/base/animation/animation_delegate.h" #include "ui/views/controls/button/button.h" -#include "ui/views/controls/menu/view_menu_delegate.h" +#include "ui/views/controls/button/menu_button_delegate.h" class Extension; class PanelBrowserView; @@ -36,7 +36,7 @@ class MenuRunner; class PanelBrowserFrameView : public BrowserNonClientFrameView, public views::ButtonListener, - public views::ViewMenuDelegate, + public views::MenuButtonDelegate, public TabIconView::TabIconViewModel, public ui::AnimationDelegate { public: @@ -89,7 +89,7 @@ class PanelBrowserFrameView : public BrowserNonClientFrameView, virtual void ButtonPressed(views::Button* sender, const views::Event& event) OVERRIDE; - // Overridden from views::ViewMenuDelegate: + // Overridden from views::MenuButtonDelegate: virtual void RunMenu(View* source, const gfx::Point& pt) OVERRIDE; // Overridden from TabIconView::TabIconViewModel: diff --git a/chrome/browser/ui/views/app_menu_button_win.cc b/chrome/browser/ui/views/app_menu_button_win.cc index 6e26b11..5415993 100644 --- a/chrome/browser/ui/views/app_menu_button_win.cc +++ b/chrome/browser/ui/views/app_menu_button_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -7,7 +7,7 @@ #include "ui/base/win/hwnd_util.h" #include "ui/views/widget/widget.h" -AppMenuButtonWin::AppMenuButtonWin(views::ViewMenuDelegate* menu_delegate) +AppMenuButtonWin::AppMenuButtonWin(views::MenuButtonDelegate* menu_delegate) : views::MenuButton(NULL, string16(), menu_delegate, false) { } diff --git a/chrome/browser/ui/views/app_menu_button_win.h b/chrome/browser/ui/views/app_menu_button_win.h index d877cf4..cb1e584 100644 --- a/chrome/browser/ui/views/app_menu_button_win.h +++ b/chrome/browser/ui/views/app_menu_button_win.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -12,7 +12,7 @@ // menu. class AppMenuButtonWin : public views::MenuButton { public: - explicit AppMenuButtonWin(views::ViewMenuDelegate* menu_delegate); + explicit AppMenuButtonWin(views::MenuButtonDelegate* menu_delegate); // MenuButton: virtual bool OnKeyPressed(const views::KeyEvent& event) OVERRIDE; diff --git a/chrome/browser/ui/views/avatar_menu_button.cc b/chrome/browser/ui/views/avatar_menu_button.cc index a89228f..312e20f 100644 --- a/chrome/browser/ui/views/avatar_menu_button.cc +++ b/chrome/browser/ui/views/avatar_menu_button.cc @@ -5,8 +5,8 @@ #include "chrome/browser/ui/views/avatar_menu_button.h" #include "chrome/browser/profiles/avatar_menu_model.h" -#include "chrome/browser/profiles/profile_metrics.h" #include "chrome/browser/profiles/profile_info_util.h" +#include "chrome/browser/profiles/profile_metrics.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/avatar_menu_bubble_view.h" #include "chrome/browser/ui/views/frame/browser_view.h" @@ -142,7 +142,7 @@ void AvatarMenuButton::SetAvatarIcon(const gfx::Image& icon, SchedulePaint(); } -// views::ViewMenuDelegate implementation +// views::MenuButtonDelegate implementation void AvatarMenuButton::RunMenu(views::View* source, const gfx::Point& pt) { ShowAvatarBubble(); } diff --git a/chrome/browser/ui/views/avatar_menu_button.h b/chrome/browser/ui/views/avatar_menu_button.h index b10a52b..0e63f25 100644 --- a/chrome/browser/ui/views/avatar_menu_button.h +++ b/chrome/browser/ui/views/avatar_menu_button.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "ui/base/models/simple_menu_model.h" #include "ui/views/controls/button/menu_button.h" -#include "ui/views/controls/menu/view_menu_delegate.h" +#include "ui/views/controls/button/menu_button_delegate.h" namespace gfx { class Canvas; @@ -30,7 +30,7 @@ void DrawTaskBarDecoration(gfx::NativeWindow window, const gfx::Image* image); // The button can optionally have a menu attached to it. class AvatarMenuButton : public views::MenuButton, - public views::ViewMenuDelegate { + public views::MenuButtonDelegate { public: // Creates a new button. If |has_menu| is true then clicking on the button // will cause the profile menu to be displayed. @@ -48,7 +48,7 @@ class AvatarMenuButton : public views::MenuButton, void ShowAvatarBubble(); private: - // views::ViewMenuDelegate + // views::MenuButtonDelegate virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE; Browser* browser_; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index 65698ad..22d1615 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -190,7 +190,7 @@ class BookmarkFolderButton : public views::MenuButton { public: BookmarkFolderButton(views::ButtonListener* listener, const string16& title, - views::ViewMenuDelegate* menu_delegate, + views::MenuButtonDelegate* menu_delegate, bool show_menu_marker) : MenuButton(listener, title, menu_delegate, show_menu_marker) { show_animation_.reset(new ui::SlideAnimation(this)); diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h index 6ad2fca..f16ea643 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -24,7 +24,7 @@ #include "ui/base/animation/animation_delegate.h" #include "ui/views/context_menu_controller.h" #include "ui/views/controls/button/button.h" -#include "ui/views/controls/menu/view_menu_delegate.h" +#include "ui/views/controls/button/menu_button_delegate.h" #include "ui/views/drag_controller.h" class BookmarkContextMenu; @@ -54,7 +54,7 @@ class TextButton; // creating the BookmarkModel. class BookmarkBarView : public DetachableToolbarView, public BookmarkModelObserver, - public views::ViewMenuDelegate, + public views::MenuButtonDelegate, public views::ButtonListener, public content::NotificationObserver, public views::ContextMenuController, @@ -224,7 +224,7 @@ class BookmarkBarView : public DetachableToolbarView, const gfx::Point& press_pt, const gfx::Point& p) OVERRIDE; - // ViewMenuDelegate: + // MenuButtonDelegate: virtual void RunMenu(views::View* view, const gfx::Point& pt) OVERRIDE; // ButtonListener: diff --git a/chrome/browser/ui/views/browser_actions_container.h b/chrome/browser/ui/views/browser_actions_container.h index 8d6e420..6fdbc13 100644 --- a/chrome/browser/ui/views/browser_actions_container.h +++ b/chrome/browser/ui/views/browser_actions_container.h @@ -17,8 +17,8 @@ #include "chrome/browser/extensions/extension_context_menu_model.h" #include "chrome/browser/extensions/extension_toolbar_model.h" #include "chrome/browser/extensions/image_loading_tracker.h" -#include "chrome/browser/ui/views/extensions/extension_keybinding_registry.h" #include "chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h" +#include "chrome/browser/ui/views/extensions/extension_keybinding_registry.h" #include "chrome/browser/ui/views/extensions/extension_popup.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -26,7 +26,7 @@ #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/tween.h" #include "ui/views/controls/button/menu_button.h" -#include "ui/views/controls/menu/view_menu_delegate.h" +#include "ui/views/controls/button/menu_button_delegate.h" #include "ui/views/controls/resize_area_delegate.h" #include "ui/views/drag_controller.h" #include "ui/views/view.h" @@ -265,7 +265,7 @@ class BrowserActionView : public views::View { //////////////////////////////////////////////////////////////////////////////// class BrowserActionsContainer : public views::View, - public views::ViewMenuDelegate, + public views::MenuButtonDelegate, public views::DragController, public views::ResizeAreaDelegate, public ui::AnimationDelegate, @@ -340,7 +340,7 @@ class BrowserActionsContainer virtual int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE; virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; - // Overridden from views::ViewMenuDelegate: + // Overridden from views::MenuButtonDelegate: virtual void RunMenu(View* source, const gfx::Point& pt) OVERRIDE; // Overridden from views::DragController: diff --git a/chrome/browser/ui/views/infobars/after_translate_infobar.h b/chrome/browser/ui/views/infobars/after_translate_infobar.h index 60bbfc4..8f51128 100644 --- a/chrome/browser/ui/views/infobars/after_translate_infobar.h +++ b/chrome/browser/ui/views/infobars/after_translate_infobar.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -9,7 +9,7 @@ #include "chrome/browser/translate/languages_menu_model.h" #include "chrome/browser/translate/options_menu_model.h" #include "chrome/browser/ui/views/infobars/translate_infobar_base.h" -#include "ui/views/controls/menu/view_menu_delegate.h" +#include "ui/views/controls/button/menu_button_delegate.h" class TranslateInfoBarDelegate; namespace views { @@ -17,7 +17,7 @@ class MenuButton; } class AfterTranslateInfoBar : public TranslateInfoBarBase, - public views::ViewMenuDelegate { + public views::MenuButtonDelegate { public: AfterTranslateInfoBar(InfoBarTabHelper* owner, TranslateInfoBarDelegate* delegate); @@ -36,7 +36,7 @@ class AfterTranslateInfoBar : public TranslateInfoBarBase, virtual void OriginalLanguageChanged() OVERRIDE; virtual void TargetLanguageChanged() OVERRIDE; - // ViewMenuDelegate: + // MenuButtonDelegate: virtual void RunMenu(View* source, const gfx::Point& pt) OVERRIDE; // The text displayed in the infobar is something like: diff --git a/chrome/browser/ui/views/infobars/before_translate_infobar.h b/chrome/browser/ui/views/infobars/before_translate_infobar.h index a8711ad..d22f5d0 100644 --- a/chrome/browser/ui/views/infobars/before_translate_infobar.h +++ b/chrome/browser/ui/views/infobars/before_translate_infobar.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -9,7 +9,7 @@ #include "chrome/browser/translate/languages_menu_model.h" #include "chrome/browser/translate/options_menu_model.h" #include "chrome/browser/ui/views/infobars/translate_infobar_base.h" -#include "ui/views/controls/menu/view_menu_delegate.h" +#include "ui/views/controls/button/menu_button_delegate.h" class TranslateInfoBarDelegate; namespace views { @@ -17,7 +17,7 @@ class MenuButton; } class BeforeTranslateInfoBar : public TranslateInfoBarBase, - public views::ViewMenuDelegate { + public views::MenuButtonDelegate { public: BeforeTranslateInfoBar(InfoBarTabHelper* owner, TranslateInfoBarDelegate* delegate); @@ -35,7 +35,7 @@ class BeforeTranslateInfoBar : public TranslateInfoBarBase, virtual int ContentMinimumWidth() const OVERRIDE; virtual void OriginalLanguageChanged() OVERRIDE; - // views::ViewMenuDelegate: + // views::MenuButtonDelegate: virtual void RunMenu(View* source, const gfx::Point& pt) OVERRIDE; // The text displayed in the infobar is something like: diff --git a/chrome/browser/ui/views/infobars/extension_infobar.h b/chrome/browser/ui/views/infobars/extension_infobar.h index dc9b0c6..cc613c6 100644 --- a/chrome/browser/ui/views/infobars/extension_infobar.h +++ b/chrome/browser/ui/views/infobars/extension_infobar.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -10,7 +10,7 @@ #include "chrome/browser/extensions/extension_infobar_delegate.h" #include "chrome/browser/extensions/image_loading_tracker.h" #include "chrome/browser/ui/views/infobars/infobar_view.h" -#include "ui/views/controls/menu/view_menu_delegate.h" +#include "ui/views/controls/button/menu_button_delegate.h" class Browser; namespace views { @@ -20,7 +20,7 @@ class MenuButton; class ExtensionInfoBar : public InfoBarView, public ImageLoadingTracker::Observer, public ExtensionInfoBarDelegate::DelegateObserver, - public views::ViewMenuDelegate { + public views::MenuButtonDelegate { public: ExtensionInfoBar(Browser* browser, InfoBarTabHelper* owner, @@ -44,7 +44,7 @@ class ExtensionInfoBar : public InfoBarView, // ExtensionInfoBarDelegate::DelegateObserver: virtual void OnDelegateDeleted() OVERRIDE; - // views::ViewMenuDelegate: + // views::MenuButtonDelegate: virtual void RunMenu(View* source, const gfx::Point& pt) OVERRIDE; ExtensionInfoBarDelegate* GetDelegate(); diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc index 516ae91..280d2ae 100644 --- a/chrome/browser/ui/views/infobars/infobar_view.cc +++ b/chrome/browser/ui/views/infobars/infobar_view.cc @@ -96,7 +96,7 @@ views::Link* InfoBarView::CreateLink(const string16& text, // static views::MenuButton* InfoBarView::CreateMenuButton( const string16& text, - views::ViewMenuDelegate* menu_delegate) { + views::MenuButtonDelegate* menu_delegate) { views::MenuButton* menu_button = new views::MenuButton( NULL, text, menu_delegate, true); menu_button->set_border(new InfoBarButtonBorder); diff --git a/chrome/browser/ui/views/infobars/infobar_view.h b/chrome/browser/ui/views/infobars/infobar_view.h index 0554b23..216469e 100644 --- a/chrome/browser/ui/views/infobars/infobar_view.h +++ b/chrome/browser/ui/views/infobars/infobar_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -28,7 +28,7 @@ class LinkListener; class MenuButton; class MenuRunner; class TextButton; -class ViewMenuDelegate; +class MenuButtonDelegate; } class InfoBarView : public InfoBar, @@ -59,7 +59,7 @@ class InfoBarView : public InfoBar, // NOTE: Subclasses must ignore button presses if we're unowned. static views::MenuButton* CreateMenuButton( const string16& text, - views::ViewMenuDelegate* menu_delegate); + views::MenuButtonDelegate* menu_delegate); // Creates a text button with an infobar-specific appearance. // NOTE: Subclasses must ignore button presses if we're unowned. diff --git a/chrome/browser/ui/views/infobars/media_stream_infobar.h b/chrome/browser/ui/views/infobars/media_stream_infobar.h index a5a913e..ace81ce 100644 --- a/chrome/browser/ui/views/infobars/media_stream_infobar.h +++ b/chrome/browser/ui/views/infobars/media_stream_infobar.h @@ -10,7 +10,7 @@ #include "chrome/browser/media/media_stream_devices_menu_model.h" #include "chrome/browser/ui/views/infobars/infobar_background.h" #include "chrome/browser/ui/views/infobars/infobar_view.h" -#include "ui/views/controls/menu/view_menu_delegate.h" +#include "ui/views/controls/button/menu_button_delegate.h" class MediaStreamInfoBarDelegate; @@ -22,7 +22,8 @@ class MenuButton; // he wants to grant access to his camera/microphone to the current webpage. It // also provides a way for the user to select which device(s) will be used by // the page. -class MediaStreamInfoBar : public InfoBarView, public views::ViewMenuDelegate { +class MediaStreamInfoBar : public InfoBarView, + public views::MenuButtonDelegate { public: MediaStreamInfoBar(InfoBarTabHelper* contents, MediaStreamInfoBarDelegate* delegate); @@ -39,7 +40,7 @@ class MediaStreamInfoBar : public InfoBarView, public views::ViewMenuDelegate { const views::Event& event) OVERRIDE; virtual int ContentMinimumWidth() const OVERRIDE; - // views::ViewMenuDelegate: + // views::MenuButtonDelegate: virtual void RunMenu(View* source, const gfx::Point& pt) OVERRIDE; MediaStreamInfoBarDelegate* delegate_; diff --git a/chrome/browser/ui/views/menu_item_view_test.cc b/chrome/browser/ui/views/menu_item_view_test.cc index eefe987..9ebb4a6 100644 --- a/chrome/browser/ui/views/menu_item_view_test.cc +++ b/chrome/browser/ui/views/menu_item_view_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -7,11 +7,11 @@ #include "chrome/browser/automation/ui_controls.h" #include "chrome/test/base/view_event_test_base.h" #include "ui/views/controls/button/menu_button.h" +#include "ui/views/controls/button/menu_button_delegate.h" #include "ui/views/controls/menu/menu_controller.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_runner.h" #include "ui/views/controls/menu/submenu_view.h" -#include "ui/views/controls/menu/view_menu_delegate.h" #include "ui/views/widget/root_view.h" #include "ui/views/widget/widget.h" @@ -30,7 +30,7 @@ // MenuItemView prevents repeated activation of a menu by clicks too // close in time. class MenuItemViewTestBase : public ViewEventTestBase, - public views::ViewMenuDelegate, + public views::MenuButtonDelegate, public views::MenuDelegate { public: MenuItemViewTestBase() @@ -68,7 +68,7 @@ class MenuItemViewTestBase : public ViewEventTestBase, return button_->GetPreferredSize(); } - // views::ViewMenuDelegate implementation. + // views::MenuButtonDelegate implementation. virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE { gfx::Point screen_location; views::View::ConvertPointToScreen(source, &screen_location); diff --git a/chrome/browser/ui/views/menu_model_adapter_test.cc b/chrome/browser/ui/views/menu_model_adapter_test.cc index ecf195b..2966bab 100644 --- a/chrome/browser/ui/views/menu_model_adapter_test.cc +++ b/chrome/browser/ui/views/menu_model_adapter_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -8,12 +8,12 @@ #include "chrome/test/base/view_event_test_base.h" #include "ui/base/models/menu_model.h" #include "ui/views/controls/button/menu_button.h" +#include "ui/views/controls/button/menu_button_delegate.h" #include "ui/views/controls/menu/menu_controller.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_model_adapter.h" #include "ui/views/controls/menu/menu_runner.h" #include "ui/views/controls/menu/submenu_view.h" -#include "ui/views/controls/menu/view_menu_delegate.h" #include "ui/views/test/test_views_delegate.h" #include "ui/views/views_delegate.h" #include "ui/views/widget/root_view.h" @@ -242,7 +242,7 @@ class TopMenuModel : public CommonMenuModel { } // namespace class MenuModelAdapterTest : public ViewEventTestBase, - public views::ViewMenuDelegate { + public views::MenuButtonDelegate { public: MenuModelAdapterTest() : ViewEventTestBase(), @@ -283,7 +283,7 @@ class MenuModelAdapterTest : public ViewEventTestBase, return button_->GetPreferredSize(); } - // views::ViewMenuDelegate implementation. + // views::MenuButtonDelegate implementation. virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE { gfx::Point screen_location; views::View::ConvertPointToScreen(source, &screen_location); diff --git a/chrome/browser/ui/views/notifications/balloon_view.h b/chrome/browser/ui/views/notifications/balloon_view.h index 8db76de..58f5629c 100644 --- a/chrome/browser/ui/views/notifications/balloon_view.h +++ b/chrome/browser/ui/views/notifications/balloon_view.h @@ -20,8 +20,8 @@ #include "ui/gfx/rect.h" #include "ui/gfx/size.h" #include "ui/views/controls/button/menu_button.h" +#include "ui/views/controls/button/menu_button_delegate.h" #include "ui/views/controls/label.h" -#include "ui/views/controls/menu/view_menu_delegate.h" #include "ui/views/view.h" #include "ui/views/widget/widget_delegate.h" @@ -41,7 +41,7 @@ class MenuRunner; // A balloon view is the UI component for a desktop notification toasts. // It draws a border, and within the border an HTML renderer. class BalloonViewImpl : public BalloonView, - public views::ViewMenuDelegate, + public views::MenuButtonDelegate, public views::WidgetDelegateView, public views::ButtonListener, public content::NotificationObserver, @@ -66,7 +66,7 @@ class BalloonViewImpl : public BalloonView, virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; virtual gfx::Size GetPreferredSize() OVERRIDE; - // views::ViewMenuDelegate interface. + // views::MenuButtonDelegate interface. virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE; // views::WidgetDelegate interface. diff --git a/chrome/browser/ui/views/status_icons/status_icon_chromeos.cc b/chrome/browser/ui/views/status_icons/status_icon_chromeos.cc index 1843b12..4d8a02c 100644 --- a/chrome/browser/ui/views/status_icons/status_icon_chromeos.cc +++ b/chrome/browser/ui/views/status_icons/status_icon_chromeos.cc @@ -11,15 +11,15 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/notification_service.h" +#include "ui/views/controls/button/menu_button_delegate.h" #include "ui/views/controls/menu/menu_delegate.h" #include "ui/views/controls/menu/menu_model_adapter.h" #include "ui/views/controls/menu/menu_runner.h" -#include "ui/views/controls/menu/view_menu_delegate.h" class StatusIconChromeOS::NotificationTrayButton : public StatusAreaButton, public views::MenuDelegate, - public views::ViewMenuDelegate { + public views::MenuButtonDelegate { public: NotificationTrayButton(StatusIconChromeOS* status_icon, StatusAreaButton::Delegate* delegate) @@ -49,7 +49,7 @@ class StatusIconChromeOS::NotificationTrayButton return retval; } - // views::ViewMenuDelegate implementation. + // views::MenuButtonDelegate implementation. virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE { views::MenuRunner* menu_runner = status_icon_->menu_runner(); diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index b87ce3a..dc161f3 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -327,7 +327,7 @@ bool ToolbarView::GetAcceleratorInfo(int id, ui::Accelerator* accel) { } //////////////////////////////////////////////////////////////////////////////// -// ToolbarView, views::ViewMenuDelegate implementation: +// ToolbarView, views::MenuButtonDelegate implementation: void ToolbarView::RunMenu(views::View* source, const gfx::Point& /* pt */) { DCHECK_EQ(VIEW_ID_APP_MENU, source->id()); diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h index 429565b..1ad84f9 100644 --- a/chrome/browser/ui/views/toolbar_view.h +++ b/chrome/browser/ui/views/toolbar_view.h @@ -20,7 +20,7 @@ #include "ui/base/animation/slide_animation.h" #include "ui/views/accessible_pane_view.h" #include "ui/views/controls/button/menu_button.h" -#include "ui/views/controls/menu/view_menu_delegate.h" +#include "ui/views/controls/button/menu_button_delegate.h" #include "ui/views/view.h" class BrowserActionsContainer; @@ -33,7 +33,7 @@ class MenuListener; // The Browser Window's toolbar. class ToolbarView : public views::AccessiblePaneView, - public views::ViewMenuDelegate, + public views::MenuButtonDelegate, public ui::AcceleratorProvider, public LocationBarView::Delegate, public content::NotificationObserver, @@ -86,7 +86,7 @@ class ToolbarView : public views::AccessiblePaneView, virtual bool SetPaneFocus(View* initial_focus) OVERRIDE; virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; - // Overridden from views::ViewMenuDelegate: + // Overridden from views::MenuButtonDelegate: virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE; // Overridden from LocationBarView::Delegate: diff --git a/ui/views/controls/button/menu_button.cc b/ui/views/controls/button/menu_button.cc index 098e64f..68b5210 100644 --- a/ui/views/controls/button/menu_button.cc +++ b/ui/views/controls/button/menu_button.cc @@ -15,7 +15,7 @@ #include "ui/gfx/image/image.h" #include "ui/gfx/screen.h" #include "ui/views/controls/button/button.h" -#include "ui/views/controls/menu/view_menu_delegate.h" +#include "ui/views/controls/button/menu_button_delegate.h" #include "ui/views/events/event.h" #include "ui/views/widget/root_view.h" #include "ui/views/widget/widget.h" @@ -48,7 +48,7 @@ const char MenuButton::kViewClassName[] = "views/MenuButton"; MenuButton::MenuButton(ButtonListener* listener, const string16& text, - ViewMenuDelegate* menu_delegate, + MenuButtonDelegate* menu_delegate, bool show_menu_marker) : TextButton(listener, text), menu_visible_(false), diff --git a/ui/views/controls/button/menu_button.h b/ui/views/controls/button/menu_button.h index 7f39e77..35702fe 100644 --- a/ui/views/controls/button/menu_button.h +++ b/ui/views/controls/button/menu_button.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -17,7 +17,7 @@ namespace views { class MouseEvent; -class ViewMenuDelegate; +class MenuButtonDelegate; //////////////////////////////////////////////////////////////////////////////// @@ -34,7 +34,7 @@ class VIEWS_EXPORT MenuButton : public TextButton { // Create a Button. MenuButton(ButtonListener* listener, const string16& text, - ViewMenuDelegate* menu_delegate, + MenuButtonDelegate* menu_delegate, bool show_menu_marker); virtual ~MenuButton(); @@ -84,7 +84,7 @@ class VIEWS_EXPORT MenuButton : public TextButton { base::Time menu_closed_time_; // The associated menu's resource identifier. - ViewMenuDelegate* menu_delegate_; + MenuButtonDelegate* menu_delegate_; // Whether or not we're showing a drop marker. bool show_menu_marker_; diff --git a/ui/views/controls/menu/view_menu_delegate.h b/ui/views/controls/button/menu_button_delegate.h index ef243e0..b296e44 100644 --- a/ui/views/controls/menu/view_menu_delegate.h +++ b/ui/views/controls/button/menu_button_delegate.h @@ -1,13 +1,11 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. -#ifndef UI_VIEWS_CONTROLS_MENU_VIEW_MENU_DELEGATE_H_ -#define UI_VIEWS_CONTROLS_MENU_VIEW_MENU_DELEGATE_H_ +#ifndef UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_DELEGATE_H_ +#define UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_DELEGATE_H_ #pragma once -#include "ui/gfx/native_widget_types.h" - namespace gfx { class Point; } @@ -18,23 +16,23 @@ class View; //////////////////////////////////////////////////////////////////////////////// // -// ViewMenuDelegate +// MenuButtonDelegate // // An interface that allows a component to tell a View about a menu that it // has constructed that the view can show (e.g. for MenuButton views, or as a // context menu.) // //////////////////////////////////////////////////////////////////////////////// -class ViewMenuDelegate { +class MenuButtonDelegate { public: - // Create and show a menu at the specified position. Source is the view the - // ViewMenuDelegate was set on. - virtual void RunMenu(View* source, const gfx::Point& pt) = 0; + // Creates and shows a menu at the specified position. |source| is the view + // the MenuButtonDelegate was set on. + virtual void RunMenu(View* source, const gfx::Point& point) = 0; protected: - virtual ~ViewMenuDelegate() {} + virtual ~MenuButtonDelegate() {} }; } // namespace views -#endif // UI_VIEWS_CONTROLS_MENU_VIEW_MENU_DELEGATE_H_ +#endif // UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_DELEGATE_H_ diff --git a/ui/views/examples/menu_example.cc b/ui/views/examples/menu_example.cc index 50640c3..db5cee1 100644 --- a/ui/views/examples/menu_example.cc +++ b/ui/views/examples/menu_example.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -9,9 +9,9 @@ #include "base/utf_string_conversions.h" #include "ui/base/models/simple_menu_model.h" #include "ui/views/controls/button/menu_button.h" +#include "ui/views/controls/button/menu_button_delegate.h" #include "ui/views/controls/button/text_button.h" #include "ui/views/controls/menu/menu_2.h" -#include "ui/views/controls/menu/view_menu_delegate.h" #include "ui/views/layout/fill_layout.h" #include "ui/views/view.h" @@ -59,13 +59,13 @@ class ExampleMenuModel : public ui::SimpleMenuModel, DISALLOW_COPY_AND_ASSIGN(ExampleMenuModel); }; -class ExampleMenuButton : public MenuButton, public ViewMenuDelegate { +class ExampleMenuButton : public MenuButton, public MenuButtonDelegate { public: ExampleMenuButton(const string16& test, bool show_menu_marker); virtual ~ExampleMenuButton(); private: - // Overridden from ViewMenuDelegate: + // Overridden from MenuButtonDelegate: virtual void RunMenu(View* source, const gfx::Point& point) OVERRIDE; scoped_ptr<ExampleMenuModel> menu_model_; diff --git a/ui/views/views.gyp b/ui/views/views.gyp index 68da3d9..cffde5c 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -80,6 +80,7 @@ 'controls/button/image_button.h', 'controls/button/menu_button.cc', 'controls/button/menu_button.h', + 'controls/button/menu_button_delegate.h', 'controls/button/radio_button.cc', 'controls/button/radio_button.h', 'controls/button/text_button.cc', @@ -154,7 +155,6 @@ 'controls/menu/menu_image_util.h', 'controls/menu/submenu_view.cc', 'controls/menu/submenu_view.h', - 'controls/menu/view_menu_delegate.h', 'controls/message_box_view.cc', 'controls/message_box_view.h', 'controls/native_control.cc', |