Revert 126700 because it broke clang on chromeos.

ash/shell.cc

 // Copyright (c) 2012 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.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 
 #include "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
@@ skipping 242 matching lines @@
   virtual base::HourClockType GetHourClockType() const OVERRIDE {
     return base::k24HourClock;
   }
 
   virtual void ShowSettings() OVERRIDE {
   }
 
   virtual void ShowDateSettings() OVERRIDE {
   }
 
-  virtual void ShowNetworkSettings() OVERRIDE {
-  }
-
   virtual void ShowHelp() OVERRIDE {
   }
 
   virtual bool IsAudioMuted() const OVERRIDE {
     return muted_;
   }
 
   virtual void SetAudioMuted(bool muted) OVERRIDE {
     muted_ = muted;
   }
 
   virtual float GetVolumeLevel() const OVERRIDE {
     return volume_;
   }
 
   virtual void SetVolumeLevel(float volume) OVERRIDE {
     volume_ = volume;
   }
 
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(DummySystemTrayDelegate);
 };
 
 }  // namespace
 
@@ skipping 374 matching lines @@
   // Create the desktop background image.
   SetDesktopBackgroundMode(BACKGROUND_IMAGE);
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash