diff options
20 files changed, 109 insertions, 70 deletions
diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc index 5ef0a24..ab620dd 100644 --- a/chrome/browser/chromeos/options/vpn_config_view.cc +++ b/chrome/browser/chromeos/options/vpn_config_view.cc @@ -19,6 +19,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" +#include "views/controls/combobox/combobox.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" diff --git a/chrome/browser/chromeos/options/vpn_config_view.h b/chrome/browser/chromeos/options/vpn_config_view.h index 6e1d1d9..87e0222 100644 --- a/chrome/browser/chromeos/options/vpn_config_view.h +++ b/chrome/browser/chromeos/options/vpn_config_view.h @@ -13,7 +13,7 @@ #include "chrome/browser/chromeos/options/network_config_view.h" #include "chrome/browser/ui/select_file_dialog.h" #include "views/controls/button/button.h" -#include "views/controls/combobox/combobox.h" +#include "views/controls/combobox/combobox_listener.h" #include "views/controls/textfield/textfield_controller.h" #include "views/view.h" @@ -27,31 +27,32 @@ namespace chromeos { class VPNConfigView : public ChildNetworkConfigView, public views::TextfieldController, public views::ButtonListener, - public views::Combobox::Listener, + public views::ComboboxListener, public CertLibrary::Observer { public: VPNConfigView(NetworkConfigView* parent, VirtualNetwork* vpn); explicit VPNConfigView(NetworkConfigView* parent); virtual ~VPNConfigView(); - // views::TextfieldController methods. - virtual void ContentsChanged( - views::Textfield* sender, const string16& new_contents) OVERRIDE; - virtual bool HandleKeyEvent( - views::Textfield* sender, const views::KeyEvent& key_event) OVERRIDE; + // views::TextfieldController: + virtual void ContentsChanged(views::Textfield* sender, + const string16& new_contents) OVERRIDE; + virtual bool HandleKeyEvent(views::Textfield* sender, + const views::KeyEvent& key_event) OVERRIDE; - // views::ButtonListener - virtual void ButtonPressed( - views::Button* sender, const views::Event& event) OVERRIDE; + // views::ButtonListener: + virtual void ButtonPressed(views::Button* sender, + const views::Event& event) OVERRIDE; - // views::Combobox::Listener - virtual void ItemChanged( - views::Combobox* combo_box, int prev_index, int new_index) OVERRIDE; + // views::ComboboxListener: + virtual void ItemChanged(views::Combobox* combo_box, + int prev_index, + int new_index) OVERRIDE; // CertLibrary::Observer: virtual void OnCertificatesLoaded(bool initial_load) OVERRIDE; - // ChildNetworkConfigView implementation. + // ChildNetworkConfigView: virtual string16 GetTitle() OVERRIDE; virtual bool CanLogin() OVERRIDE; virtual bool Login() OVERRIDE; diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc index f64b13e..77d7f45 100644 --- a/chrome/browser/chromeos/options/wifi_config_view.cc +++ b/chrome/browser/chromeos/options/wifi_config_view.cc @@ -19,6 +19,7 @@ #include "ui/views/layout/layout_constants.h" #include "views/controls/button/checkbox.h" #include "views/controls/button/image_button.h" +#include "views/controls/combobox/combobox.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" diff --git a/chrome/browser/chromeos/options/wifi_config_view.h b/chrome/browser/chromeos/options/wifi_config_view.h index b80c141..295dce3 100644 --- a/chrome/browser/chromeos/options/wifi_config_view.h +++ b/chrome/browser/chromeos/options/wifi_config_view.h @@ -8,13 +8,15 @@ #include <string> +#include "base/basictypes.h" +#include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "chrome/browser/chromeos/cros/cert_library.h" #include "chrome/browser/chromeos/options/network_config_view.h" #include "ui/base/models/combobox_model.h" #include "views/controls/button/button.h" -#include "views/controls/combobox/combobox.h" +#include "views/controls/combobox/combobox_listener.h" #include "views/controls/textfield/textfield_controller.h" #include "views/view.h" @@ -30,7 +32,7 @@ namespace chromeos { class WifiConfigView : public ChildNetworkConfigView, public views::TextfieldController, public views::ButtonListener, - public views::Combobox::Listener, + public views::ComboboxListener, public CertLibrary::Observer { public: // Wifi login dialog for wifi network |wifi|. |wifi| must be a non NULL @@ -41,23 +43,24 @@ class WifiConfigView : public ChildNetworkConfigView, virtual ~WifiConfigView(); // views::TextfieldController: - virtual void ContentsChanged( - views::Textfield* sender, const string16& new_contents) OVERRIDE; - virtual bool HandleKeyEvent( - views::Textfield* sender, const views::KeyEvent& key_event) OVERRIDE; + virtual void ContentsChanged(views::Textfield* sender, + const string16& new_contents) OVERRIDE; + virtual bool HandleKeyEvent(views::Textfield* sender, + const views::KeyEvent& key_event) OVERRIDE; // views::ButtonListener: - virtual void ButtonPressed( - views::Button* sender, const views::Event& event) OVERRIDE; + virtual void ButtonPressed(views::Button* sender, + const views::Event& event) OVERRIDE; - // views::Combobox::Listener: - virtual void ItemChanged( - views::Combobox* combo_box, int prev_index, int new_index) OVERRIDE; + // views::ComboboxListener: + virtual void ItemChanged(views::Combobox* combo_box, + int prev_index, + int new_index) OVERRIDE; // CertLibrary::Observer: virtual void OnCertificatesLoaded(bool initial_load) OVERRIDE; - // ChildNetworkConfigView implementation. + // ChildNetworkConfigView: virtual string16 GetTitle() OVERRIDE; virtual bool CanLogin() OVERRIDE; virtual bool Login() OVERRIDE; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc index 26b0649..306b040 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc @@ -27,6 +27,7 @@ #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/widget.h" #include "views/controls/button/text_button.h" +#include "views/controls/combobox/combobox.h" #include "views/controls/label.h" #include "views/controls/link.h" #include "views/controls/textfield/textfield.h" @@ -279,7 +280,7 @@ void BookmarkBubbleView::LinkClicked(views::Link* source, int event_flags) { StartFade(false); } -void BookmarkBubbleView::ItemChanged(views::Combobox* combobox, +void BookmarkBubbleView::ItemChanged(views::Combobox* combo_box, int prev_index, int new_index) { if (new_index + 1 == parent_model_.GetItemCount()) { diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h index 7a7d20b..110ca45 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h @@ -6,12 +6,14 @@ #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BUBBLE_VIEW_H_ #pragma once +#include "base/basictypes.h" +#include "base/compiler_specific.h" #include "base/string16.h" #include "chrome/browser/bookmarks/recently_used_folders_combo_model.h" #include "googleurl/src/gurl.h" #include "ui/views/bubble/bubble_delegate.h" #include "views/controls/button/button.h" -#include "views/controls/combobox/combobox.h" +#include "views/controls/combobox/combobox_listener.h" #include "views/controls/link_listener.h" class Profile; @@ -28,7 +30,7 @@ class Textfield; class BookmarkBubbleView : public views::BubbleDelegateView, public views::LinkListener, public views::ButtonListener, - public views::Combobox::Listener { + public views::ComboboxListener { public: static void ShowBubble(views::View* anchor_view, Profile* profile, @@ -65,16 +67,19 @@ class BookmarkBubbleView : public views::BubbleDelegateView, // Returns the title to display. string16 GetTitle(); - // views::LinkListener method, either unstars the item or shows the bookmark - // editor (depending upon which link was clicked). + // Overridden from views::LinkListener: + // Either unstars the item or shows the bookmark editor (depending upon which + // link was clicked). virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE; - // ButtonListener method, closes the bubble or opens the edit dialog. + // Overridden from views::ButtonListener: + // Closes the bubble or opens the edit dialog. virtual void ButtonPressed(views::Button* sender, const views::Event& event) OVERRIDE; - // Combobox::Listener method. Changes the parent of the bookmark. - virtual void ItemChanged(views::Combobox* combobox, + // Overridden from views::ComboboxListener: + // Changes the parent of the bookmark. + virtual void ItemChanged(views::Combobox* combo_box, int prev_index, int new_index) OVERRIDE; diff --git a/chrome/browser/ui/views/cookie_info_view.cc b/chrome/browser/ui/views/cookie_info_view.cc index 6d88b9c..e937278 100644 --- a/chrome/browser/ui/views/cookie_info_view.cc +++ b/chrome/browser/ui/views/cookie_info_view.cc @@ -20,6 +20,7 @@ #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" #include "views/border.h" +#include "views/controls/combobox/combobox.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" #include "views/controls/tree/tree_view.h" @@ -136,7 +137,7 @@ void CookieInfoView::ViewHierarchyChanged(bool is_add, } /////////////////////////////////////////////////////////////////////////////// -// CookieInfoView, views::Combobox::Listener overrides. +// CookieInfoView, views::ComboboxListener overrides. void CookieInfoView::ItemChanged(views::Combobox* combo_box, int prev_index, diff --git a/chrome/browser/ui/views/cookie_info_view.h b/chrome/browser/ui/views/cookie_info_view.h index 0bc8e43..90bd3cc 100644 --- a/chrome/browser/ui/views/cookie_info_view.h +++ b/chrome/browser/ui/views/cookie_info_view.h @@ -9,10 +9,12 @@ #include <string> #include <vector> +#include "base/basictypes.h" +#include "base/compiler_specific.h" #include "base/string16.h" #include "net/base/cookie_monster.h" #include "ui/base/models/combobox_model.h" -#include "views/controls/combobox/combobox.h" +#include "views/controls/combobox/combobox_listener.h" #include "views/view.h" namespace views { @@ -38,7 +40,7 @@ class CookieInfoViewDelegate { // // Responsible for displaying a tabular grid of Cookie information. class CookieInfoView : public views::View, - public views::Combobox::Listener, + public views::ComboboxListener, public ui::ComboboxModel { public: explicit CookieInfoView(bool editable_expiration_date); @@ -61,19 +63,19 @@ class CookieInfoView : public views::View, void set_delegate(CookieInfoViewDelegate* delegate) { delegate_ = delegate; } protected: - // views::View overrides: + // views::View: virtual void ViewHierarchyChanged(bool is_add, views::View* parent, - views::View* child); + views::View* child) OVERRIDE; - // views::Combobox::Listener override. + // views::ComboboxListener: virtual void ItemChanged(views::Combobox* combo_box, int prev_index, - int new_index); + int new_index) OVERRIDE; - // ui::ComboboxModel overrides for expires_value_combobox_. - virtual int GetItemCount(); - virtual string16 GetItemAt(int index); + // ui::ComboboxModel: + virtual int GetItemCount() OVERRIDE; + virtual string16 GetItemAt(int index) OVERRIDE; private: // Layout helper routines. @@ -119,4 +121,3 @@ class CookieInfoView : public views::View, }; #endif // CHROME_BROWSER_UI_VIEWS_COOKIE_INFO_VIEW_H_ - diff --git a/chrome/browser/ui/views/uninstall_view.cc b/chrome/browser/ui/views/uninstall_view.cc index fdeb245..24c882b 100644 --- a/chrome/browser/ui/views/uninstall_view.cc +++ b/chrome/browser/ui/views/uninstall_view.cc @@ -17,6 +17,7 @@ #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" #include "views/controls/button/checkbox.h" +#include "views/controls/combobox/combobox.h" #include "views/controls/label.h" UninstallView::UninstallView(int* user_selection) diff --git a/chrome/browser/ui/views/uninstall_view.h b/chrome/browser/ui/views/uninstall_view.h index bbc30ff..8002b29 100644 --- a/chrome/browser/ui/views/uninstall_view.h +++ b/chrome/browser/ui/views/uninstall_view.h @@ -11,10 +11,10 @@ #include "base/string16.h" #include "ui/base/models/combobox_model.h" #include "ui/views/window/dialog_delegate.h" -#include "views/controls/combobox/combobox.h" namespace views { class Checkbox; +class Combobox; class Label; } diff --git a/ui/views/examples/combobox_example.cc b/ui/views/examples/combobox_example.cc index 016ae6a..e035743 100644 --- a/ui/views/examples/combobox_example.cc +++ b/ui/views/examples/combobox_example.cc @@ -8,6 +8,7 @@ #include "base/utf_string_conversions.h" #include "ui/base/models/combobox_model.h" #include "ui/views/layout/fill_layout.h" +#include "views/controls/combobox/combobox.h" namespace { diff --git a/ui/views/examples/combobox_example.h b/ui/views/examples/combobox_example.h index e198c9c..56aba1c 100644 --- a/ui/views/examples/combobox_example.h +++ b/ui/views/examples/combobox_example.h @@ -9,12 +9,12 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "ui/views/examples/example_base.h" -#include "views/controls/combobox/combobox.h" +#include "views/controls/combobox/combobox_listener.h" namespace examples { class ComboboxExample : public ExampleBase, - public views::Combobox::Listener { + public views::ComboboxListener { public: explicit ComboboxExample(ExamplesMain* main); virtual ~ComboboxExample(); @@ -23,7 +23,7 @@ class ComboboxExample : public ExampleBase, virtual void CreateExampleView(views::View* container) OVERRIDE; private: - // Overridden from views::Combobox::Listener: + // Overridden from views::ComboboxListener: virtual void ItemChanged(views::Combobox* combo_box, int prev_index, int new_index) OVERRIDE; diff --git a/ui/views/examples/native_theme_button_example.cc b/ui/views/examples/native_theme_button_example.cc index d9350ed..cdd3f2a 100644 --- a/ui/views/examples/native_theme_button_example.cc +++ b/ui/views/examples/native_theme_button_example.cc @@ -14,6 +14,7 @@ #include "ui/gfx/canvas.h" #include "ui/views/examples/example_combobox_model.h" #include "ui/views/layout/grid_layout.h" +#include "views/controls/combobox/combobox.h" #include "views/controls/label.h" #include "views/native_theme_painter.h" diff --git a/ui/views/examples/native_theme_button_example.h b/ui/views/examples/native_theme_button_example.h index 59f5e97..8b59fec 100644 --- a/ui/views/examples/native_theme_button_example.h +++ b/ui/views/examples/native_theme_button_example.h @@ -10,7 +10,7 @@ #include "ui/gfx/native_theme.h" #include "ui/views/examples/example_base.h" #include "views/controls/button/custom_button.h" -#include "views/controls/combobox/combobox.h" +#include "views/controls/combobox/combobox_listener.h" #include "views/native_theme_delegate.h" #include "views/native_theme_painter.h" @@ -24,7 +24,7 @@ namespace examples { // A subclass of button to test native theme rendering. class ExampleNativeThemeButton : public views::CustomButton, public views::NativeThemeDelegate, - public views::Combobox::Listener { + public views::ComboboxListener { public: ExampleNativeThemeButton(views::ButtonListener* listener, views::Combobox* cb_part, @@ -34,11 +34,11 @@ class ExampleNativeThemeButton : public views::CustomButton, std::string MessWithState(); private: - // Overridden from View: + // Overridden from views::View: virtual gfx::Size GetPreferredSize() OVERRIDE; virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE; - // Overridden from views::Combobox::Listener: + // Overridden from views::ComboboxListener: virtual void ItemChanged(views::Combobox* combo_box, int prev_index, int new_index) OVERRIDE; diff --git a/ui/views/examples/text_example.cc b/ui/views/examples/text_example.cc index baa7f33..415337a 100644 --- a/ui/views/examples/text_example.cc +++ b/ui/views/examples/text_example.cc @@ -11,6 +11,7 @@ #include "ui/views/examples/example_combobox_model.h" #include "ui/views/layout/grid_layout.h" #include "views/controls/button/checkbox.h" +#include "views/controls/combobox/combobox.h" #include "views/controls/label.h" #include "views/view.h" diff --git a/ui/views/examples/text_example.h b/ui/views/examples/text_example.h index fb8c4f0..e99fb1a 100644 --- a/ui/views/examples/text_example.h +++ b/ui/views/examples/text_example.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "ui/views/examples/example_base.h" #include "views/controls/button/button.h" -#include "views/controls/combobox/combobox.h" +#include "views/controls/combobox/combobox_listener.h" namespace views { class Checkbox; @@ -21,7 +21,7 @@ namespace examples { class TextExample : public ExampleBase, public views::ButtonListener, - public views::Combobox::Listener { + public views::ComboboxListener { public: explicit TextExample(ExamplesMain* main); virtual ~TextExample(); @@ -40,7 +40,7 @@ class TextExample : public ExampleBase, virtual void ButtonPressed(views::Button* button, const views::Event& event) OVERRIDE; - // Overridden from views::Combobox::Listener: + // Overridden from views::ComboboxListener: virtual void ItemChanged(views::Combobox* combo_box, int prev_index, int new_index) OVERRIDE; diff --git a/views/controls/combobox/combobox.cc b/views/controls/combobox/combobox.cc index cb7310d..022e710 100644 --- a/views/controls/combobox/combobox.cc +++ b/views/controls/combobox/combobox.cc @@ -10,6 +10,7 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/models/combobox_model.h" #include "ui/views/widget/widget.h" +#include "views/controls/combobox/combobox_listener.h" #include "views/controls/native/native_view_host.h" namespace views { diff --git a/views/controls/combobox/combobox.h b/views/controls/combobox/combobox.h index a582688..8579122 100644 --- a/views/controls/combobox/combobox.h +++ b/views/controls/combobox/combobox.h @@ -18,29 +18,20 @@ class ComboboxModel; namespace views { +class ComboboxListener; + // A non-editable combo-box (aka a drop-down list) class VIEWS_EXPORT Combobox : public View { public: // The combobox's class name. static const char kViewClassName[]; - class Listener { - public: - // This is invoked once the selected item changed. - virtual void ItemChanged(Combobox* combo_box, - int prev_index, - int new_index) = 0; - - protected: - virtual ~Listener() {} - }; - // |model| is not owned by the combo box. explicit Combobox(ui::ComboboxModel* model); virtual ~Combobox(); // Register |listener| for item change events. - void set_listener(Listener* listener) { + void set_listener(ComboboxListener* listener) { listener_ = listener; } @@ -94,8 +85,8 @@ class VIEWS_EXPORT Combobox : public View { // Our model. ui::ComboboxModel* model_; - // Item change listener. - Listener* listener_; + // The combobox's listener. Notified when the selected item change. + ComboboxListener* listener_; // The current selection. int selected_item_; diff --git a/views/controls/combobox/combobox_listener.h b/views/controls/combobox/combobox_listener.h new file mode 100644 index 0000000..3453ce1 --- /dev/null +++ b/views/controls/combobox/combobox_listener.h @@ -0,0 +1,28 @@ +// 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. + +#ifndef VIEWS_CONTROLS_COMBOBOX_COMBOBOX_LISTENER_H_ +#define VIEWS_CONTROLS_COMBOBOX_COMBOBOX_LISTENER_H_ +#pragma once + +namespace views { + +class Combobox; + +// An interface implemented by an object to let it know that the selected item +// of a combobox changed. +class ComboboxListener { + public: + // This is invoked once the selected item changed. + virtual void ItemChanged(Combobox* combo_box, + int prev_index, + int new_index) = 0; + + protected: + virtual ~ComboboxListener() {} +}; + +} // namespace views + +#endif // VIEWS_CONTROLS_COMBOBOX_COMBOBOX_LISTENER_H_ diff --git a/views/views.gyp b/views/views.gyp index e2ceaca..02b90bd 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -75,6 +75,7 @@ 'controls/button/text_button.h', 'controls/combobox/combobox.cc', 'controls/combobox/combobox.h', + 'controls/combobox/combobox_listener.h', 'controls/combobox/native_combobox_gtk.cc', 'controls/combobox/native_combobox_gtk.h', 'controls/combobox/native_combobox_views.cc', |