diff options
| author | avayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-26 19:06:23 +0000 |
|---|---|---|
| committer | avayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-26 19:06:23 +0000 |
| commit | 5971dfc8804e4bf6fc32003b74d83034ffab5ff1 (patch) | |
| tree | 468bcc573bd8d5201a747194c539bed13f99f2cb /chrome/browser/chromeos | |
| parent | 510fe6af8d41e29ff94b627a8c596c33c1778bf1 (diff) | |
| download | chromium_src-5971dfc8804e4bf6fc32003b74d83034ffab5ff1.zip chromium_src-5971dfc8804e4bf6fc32003b74d83034ffab5ff1.tar.gz chromium_src-5971dfc8804e4bf6fc32003b74d83034ffab5ff1.tar.bz2 | |
Remove literal dependencies on browser for network menu button (actually
just renamed a couple of things).
BUG=0
TEST=Just a rename so doesn't change anything.
Review URL: http://codereview.chromium.org/551153
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37126 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
| -rw-r--r-- | chrome/browser/chromeos/network_menu_button.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/chromeos/network_menu_button.h | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/network_menu_button.cc b/chrome/browser/chromeos/network_menu_button.cc index 78acbfa..0313e0c 100644 --- a/chrome/browser/chromeos/network_menu_button.cc +++ b/chrome/browser/chromeos/network_menu_button.cc @@ -30,10 +30,10 @@ SkBitmap* NetworkMenuButton::menu_wifi_icons_ = NULL; SkBitmap* NetworkMenuButton::menu_wired_icon_ = NULL; SkBitmap* NetworkMenuButton::menu_disconnected_icon_ = NULL; -NetworkMenuButton::NetworkMenuButton(gfx::NativeWindow browser_window) +NetworkMenuButton::NetworkMenuButton(gfx::NativeWindow parent_window) : StatusAreaButton(this), ALLOW_THIS_IN_INITIALIZER_LIST(network_menu_(this)), - browser_window_(browser_window), + parent_window_(parent_window), ALLOW_THIS_IN_INITIALIZER_LIST(animation_connecting_(this)), ALLOW_THIS_IN_INITIALIZER_LIST(animation_downloading_(this)), ALLOW_THIS_IN_INITIALIZER_LIST(animation_uploading_(this)) { @@ -134,14 +134,14 @@ void NetworkMenuButton::ActivatedAt(int index) { } else { PasswordDialogView* dialog = new PasswordDialogView(this, activated_wifi_network_.ssid); - views::Window* window = views::Window::CreateChromeWindow(browser_window_, + views::Window* window = views::Window::CreateChromeWindow(parent_window_, gfx::Rect(), dialog); // Draw the password dialog right below this button and right aligned. gfx::Size size = dialog->GetPreferredSize(); gfx::Rect rect = bounds(); gfx::Point point = gfx::Point(rect.width() - size.width(), rect.height()); ConvertPointToScreen(this, &point); - window->SetBounds(gfx::Rect(point, size), browser_window_); + window->SetBounds(gfx::Rect(point, size), parent_window_); window->Show(); } } else if (menu_items_[index].flags & FLAG_ACTIVATE_CELLULAR) { diff --git a/chrome/browser/chromeos/network_menu_button.h b/chrome/browser/chromeos/network_menu_button.h index ba93ff9..6126631 100644 --- a/chrome/browser/chromeos/network_menu_button.h +++ b/chrome/browser/chromeos/network_menu_button.h @@ -16,7 +16,6 @@ #include "views/controls/menu/menu_2.h" #include "views/controls/menu/view_menu_delegate.h" -class Browser; class SkBitmap; namespace gfx { @@ -58,7 +57,7 @@ class NetworkMenuButton : public StatusAreaButton, public PasswordDialogDelegate, public NetworkLibrary::Observer { public: - explicit NetworkMenuButton(gfx::NativeWindow browser_window); + explicit NetworkMenuButton(gfx::NativeWindow parent_window); virtual ~NetworkMenuButton(); // menus::MenuModel implementation. @@ -170,7 +169,7 @@ class NetworkMenuButton : public StatusAreaButton, views::Menu2 network_menu_; // Our parent window - gfx::NativeWindow browser_window_; + gfx::NativeWindow parent_window_; // The throb animation that does the wifi connecting animation. ThrobAnimation animation_connecting_; |