| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_DROPDOWN_BUTTON_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_DROPDOWN_BUTTON_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_DROPDOWN_BUTTON_H_ | 6 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_DROPDOWN_BUTTON_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "chrome/browser/chromeos/cros/network_library.h" | 10 #include "chrome/browser/chromeos/cros/network_library.h" |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 // Overridden from views::View. | 57 // Overridden from views::View. |
| 58 virtual void OnLocaleChanged() OVERRIDE; | 58 virtual void OnLocaleChanged() OVERRIDE; |
| 59 | 59 |
| 60 // LoginHtmlDialog::Delegate implementation: | 60 // LoginHtmlDialog::Delegate implementation: |
| 61 virtual void OnDialogClosed() OVERRIDE; | 61 virtual void OnDialogClosed() OVERRIDE; |
| 62 | 62 |
| 63 private: | 63 private: |
| 64 void SetNetworkIconAndText(); | 64 void SetNetworkIconAndText(); |
| 65 | 65 |
| 66 // The Network menu. | 66 // The Network menu. |
| 67 scoped_ptr<NetworkMenu> network_menu_; | 67 scoped_ptr<NetworkMenuView> network_menu_; |
| 68 | 68 |
| 69 // The Network menu icon. | 69 // The Network menu icon. |
| 70 scoped_ptr<NetworkMenuIcon> network_icon_; | 70 scoped_ptr<NetworkMenuIcon> network_icon_; |
| 71 | 71 |
| 72 gfx::NativeWindow parent_window_; | 72 gfx::NativeWindow parent_window_; |
| 73 | 73 |
| 74 // If true things like proxy settings menu item will be supported. | 74 // If true things like proxy settings menu item will be supported. |
| 75 bool should_show_options_; | 75 bool should_show_options_; |
| 76 | 76 |
| 77 // Proxy settings dialog that can be invoked from network menu. | 77 // Proxy settings dialog that can be invoked from network menu. |
| 78 scoped_ptr<LoginHtmlDialog> proxy_settings_dialog_; | 78 scoped_ptr<LoginHtmlDialog> proxy_settings_dialog_; |
| 79 | 79 |
| 80 DISALLOW_COPY_AND_ASSIGN(NetworkDropdownButton); | 80 DISALLOW_COPY_AND_ASSIGN(NetworkDropdownButton); |
| 81 }; | 81 }; |
| 82 | 82 |
| 83 } // namespace chromeos | 83 } // namespace chromeos |
| 84 | 84 |
| 85 #endif // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_DROPDOWN_BUTTON_H_ | 85 #endif // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_DROPDOWN_BUTTON_H_ |
| OLD | NEW |