Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3914)

Unified Diff: chrome/browser/chromeos/options/wifi_config_view.h

Issue 8607001: views: Factor out Listener from Combobox into its own header file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sky review Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/options/wifi_config_view.h
diff --git a/chrome/browser/chromeos/options/wifi_config_view.h b/chrome/browser/chromeos/options/wifi_config_view.h
index b80c14199f04896c95dc6714ee4f2a42b2e11bfc..295dce33e695447b44deef3c6b2a18fc3a3500b0 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;
« no previous file with comments | « chrome/browser/chromeos/options/vpn_config_view.cc ('k') | chrome/browser/chromeos/options/wifi_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698