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

Side by Side Diff: chrome/browser/chromeos/status/network_menu_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: Move NetworkMenuModel declaration into .cc. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_MENU_BUTTON_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_BUTTON_H_
6 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_BUTTON_H_ 6 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_BUTTON_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 // NetworkLibrary::NetworkObserver implementation. 67 // NetworkLibrary::NetworkObserver implementation.
68 virtual void OnNetworkChanged(NetworkLibrary* cros, const Network* network); 68 virtual void OnNetworkChanged(NetworkLibrary* cros, const Network* network);
69 // NetworkLibrary::CellularDataPlanObserver implementation. 69 // NetworkLibrary::CellularDataPlanObserver implementation.
70 virtual void OnCellularDataPlanChanged(NetworkLibrary* cros); 70 virtual void OnCellularDataPlanChanged(NetworkLibrary* cros);
71 71
72 // NetworkMenu implementation: 72 // NetworkMenu implementation:
73 virtual bool IsBrowserMode() const; 73 virtual bool IsBrowserMode() const;
74 74
75 protected: 75 protected:
76 // NetworkMenu implementation: 76 // NetworkMenu implementation:
77 virtual views::MenuButton* GetMenuButton();
77 virtual gfx::NativeWindow GetNativeWindow() const; 78 virtual gfx::NativeWindow GetNativeWindow() const;
78 virtual void OpenButtonOptions(); 79 virtual void OpenButtonOptions();
79 virtual bool ShouldOpenButtonOptions() const; 80 virtual bool ShouldOpenButtonOptions() const;
80 81
81 // views::View 82 // views::View
82 virtual void OnLocaleChanged() OVERRIDE; 83 virtual void OnLocaleChanged() OVERRIDE;
83 84
84 private: 85 private:
85 // Sets the icon and the badges (badges are at the bottom of the icon). 86 // Sets the icon and the badges (badges are at the bottom of the icon).
86 void SetIconAndBadges(const SkBitmap* icon, 87 void SetIconAndBadges(const SkBitmap* icon,
(...skipping 29 matching lines...) Expand all
116 // If any network is currently active, this is the service path of the one 117 // If any network is currently active, this is the service path of the one
117 // whose status is displayed in the network menu button. 118 // whose status is displayed in the network menu button.
118 std::string active_network_; 119 std::string active_network_;
119 120
120 DISALLOW_COPY_AND_ASSIGN(NetworkMenuButton); 121 DISALLOW_COPY_AND_ASSIGN(NetworkMenuButton);
121 }; 122 };
122 123
123 } // namespace chromeos 124 } // namespace chromeos
124 125
125 #endif // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_BUTTON_H_ 126 #endif // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_BUTTON_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/network_menu.cc ('k') | chrome/browser/chromeos/status/network_menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698