diff options
| author | glotov@google.com <glotov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-13 12:32:02 +0000 |
|---|---|---|
| committer | glotov@google.com <glotov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-13 12:32:02 +0000 |
| commit | d34f59d0a26db8dd33b52927fbfc425711655b32 (patch) | |
| tree | 70da46a84b67da6a3af9358f7831b9eb6a3f1b7f /chrome/browser/chromeos/status | |
| parent | fdcf1be8a11acd9060fc3db1947dd1d78b568d9d (diff) | |
| download | chromium_src-d34f59d0a26db8dd33b52927fbfc425711655b32.zip chromium_src-d34f59d0a26db8dd33b52927fbfc425711655b32.tar.gz chromium_src-d34f59d0a26db8dd33b52927fbfc425711655b32.tar.bz2 | |
Adding style notion to the TextButton.
Welcome screen uses different style of buttons.
BUG=chromium-os:8468
TEST=none
Review URL: http://codereview.chromium.org/4402001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66061 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/status')
| -rw-r--r-- | chrome/browser/chromeos/status/network_dropdown_button.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/chromeos/status/network_dropdown_button.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/chromeos/status/network_dropdown_button.cc b/chrome/browser/chromeos/status/network_dropdown_button.cc index d2be0ec..32ff4e6 100644 --- a/chrome/browser/chromeos/status/network_dropdown_button.cc +++ b/chrome/browser/chromeos/status/network_dropdown_button.cc @@ -25,10 +25,10 @@ const int NetworkDropdownButton::kThrobDuration = 1000; NetworkDropdownButton::NetworkDropdownButton(bool browser_mode, gfx::NativeWindow parent_window) - : MenuButton(NULL, - l10n_util::GetString(IDS_STATUSBAR_NO_NETWORKS_MESSAGE), - this, - true), + : DropDownButton(NULL, + l10n_util::GetString(IDS_STATUSBAR_NO_NETWORKS_MESSAGE), + this, + true), browser_mode_(browser_mode), ALLOW_THIS_IN_INITIALIZER_LIST(animation_connecting_(this)), parent_window_(parent_window) { diff --git a/chrome/browser/chromeos/status/network_dropdown_button.h b/chrome/browser/chromeos/status/network_dropdown_button.h index ec2e337..a187f71 100644 --- a/chrome/browser/chromeos/status/network_dropdown_button.h +++ b/chrome/browser/chromeos/status/network_dropdown_button.h @@ -9,7 +9,7 @@ #include "app/throb_animation.h" #include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/chromeos/status/network_menu.h" -#include "views/controls/button/menu_button.h" +#include "chrome/browser/chromeos/views/dropdown_button.h" namespace chromeos { @@ -17,7 +17,7 @@ namespace chromeos { // This class will handle getting the networks to show connected network // at top level and populating the menu. // See NetworkMenu for more details. -class NetworkDropdownButton : public views::MenuButton, +class NetworkDropdownButton : public DropDownButton, public NetworkMenu, public NetworkLibrary::NetworkManagerObserver { public: |