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

Unified Diff: ash/shell.cc

Issue 9702035: Revert 126700 because it broke clang on chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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
« no previous file with comments | « ash/ash_strings.grd ('k') | ash/system/network/tray_network.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
===================================================================
--- ash/shell.cc (revision 126705)
+++ ash/shell.cc (working copy)
@@ -260,9 +260,6 @@
virtual void ShowDateSettings() OVERRIDE {
}
- virtual void ShowNetworkSettings() OVERRIDE {
- }
-
virtual void ShowHelp() OVERRIDE {
}
@@ -285,22 +282,10 @@
virtual void ShutDown() OVERRIDE {}
virtual void SignOut() OVERRIDE {}
virtual void RequestLockScreen() OVERRIDE {}
- virtual NetworkIconInfo GetMostRelevantNetworkIcon(bool large) OVERRIDE {
+ virtual NetworkIconInfo GetMostRelevantNetworkIcon() {
return NetworkIconInfo();
}
- virtual void GetAvailableNetworks(
- std::vector<NetworkIconInfo>* list) OVERRIDE {
- }
- virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE {
- }
-
- virtual void ToggleAirplaneMode() OVERRIDE {
- }
-
- virtual void ChangeProxySettings() OVERRIDE {
- }
-
bool muted_;
float volume_;
SkBitmap null_image_;
« no previous file with comments | « ash/ash_strings.grd ('k') | ash/system/network/tray_network.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698