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

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

Issue 6811025: Change status button menu implementation from Menu2 to MenuItemView. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixes for merge with trunk. 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.h
diff --git a/chrome/browser/chromeos/status/network_dropdown_button.h b/chrome/browser/chromeos/status/network_dropdown_button.h
index 8a9ac7aa2ad74cec9516b34bfc765e4e4c74d0a4..a9edbb194ffbebdaabb5ad83d910bd18bcee00c2 100644
--- a/chrome/browser/chromeos/status/network_dropdown_button.h
+++ b/chrome/browser/chromeos/status/network_dropdown_button.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -36,10 +36,14 @@ class NetworkDropdownButton : public DropDownButton,
protected:
// NetworkMenu implementation:
- virtual bool IsBrowserMode() const { return browser_mode_; }
- virtual gfx::NativeWindow GetNativeWindow() const { return parent_window_; }
- virtual void OpenButtonOptions() {}
- virtual bool ShouldOpenButtonOptions() const { return false; }
+ virtual bool IsBrowserMode() const OVERRIDE { return browser_mode_; }
+ virtual views::MenuButton* GetMenuButton() OVERRIDE { return this; }
+ virtual gfx::NativeWindow GetNativeWindow() OVERRIDE const {
+ return parent_window_;
+ }
+
+ virtual void OpenButtonOptions() OVERRIDE {}
+ virtual bool ShouldOpenButtonOptions() OVERRIDE const { return false; }
private:
bool browser_mode_;

Powered by Google App Engine
This is Rietveld 408576698