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

Unified Diff: chrome/browser/chromeos/status/network_dropdown_button.cc

Issue 6811025: Change status button menu implementation from Menu2 to MenuItemView. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Mainly updates to newer coding style. Created 9 years, 8 months 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/status/network_dropdown_button.cc
diff --git a/chrome/browser/chromeos/status/network_dropdown_button.cc b/chrome/browser/chromeos/status/network_dropdown_button.cc
index 9149cab43a7f8f8bed84035e30771255e31089f6..d6d32ad45cf6deb3e3498fc401f2f845ab7674e1 100644
--- a/chrome/browser/chromeos/status/network_dropdown_button.cc
+++ b/chrome/browser/chromeos/status/network_dropdown_button.cc
@@ -17,8 +17,7 @@
namespace chromeos {
-////////////////////////////////////////////////////////////////////////////////
-// NetworkDropdownButton
+// NetworkDropdownButton ------------------------------------------------------
// static
const int NetworkDropdownButton::kThrobDuration = 1000;
@@ -44,8 +43,7 @@ NetworkDropdownButton::~NetworkDropdownButton() {
CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this);
}
-////////////////////////////////////////////////////////////////////////////////
-// NetworkMenuButton, ui::AnimationDelegate implementation:
+// NetworkMenuButton, ui::AnimationDelegate implementation: -------------------
void NetworkDropdownButton::AnimationProgressed(
const ui::Animation* animation) {
@@ -62,7 +60,26 @@ void NetworkDropdownButton::Refresh() {
OnNetworkManagerChanged(CrosLibrary::Get()->GetNetworkLibrary());
}
-////////////////////////////////////////////////////////////////////////////////
+// NetworkDropdownButton, NetworkMenu implementation: -------------------------
+bool NetworkDropdownButton::IsBrowserMode() const OVERRIDE {
+ return browser_mode_;
+}
+
+views::MenuButton* NetworkDropdownButton::GetMenuButton() OVERRIDE {
+ return this;
+}
+
+gfx::NativeWindow NetworkDropdownButton::GetNativeWindow() OVERRIDE const {
+ return parent_window_;
+}
+
+void NetworkDropdownButton::OpenButtonOptions() OVERRIDE {
+}
+
+bool NetworkDropdownButton::ShouldOpenButtonOptions() OVERRIDE const {
+ return false;
+}
+
// NetworkDropdownButton, NetworkLibrary::NetworkManagerObserver implementation:
void NetworkDropdownButton::OnNetworkManagerChanged(NetworkLibrary* cros) {

Powered by Google App Engine
This is Rietveld 408576698