Revert 134774 because of win aura compile and chromium os browser_test crashes - Created uber tray …

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 291 matching lines @@
 
   virtual void ShowDateSettings() OVERRIDE {
   }
 
   virtual void ShowNetworkSettings() OVERRIDE {
   }
 
   virtual void ShowBluetoothSettings() OVERRIDE {
   }
 
-  virtual void ShowDriveSettings() OVERRIDE {
-  }
-
   virtual void ShowIMESettings() OVERRIDE {
   }
 
   virtual void ShowHelp() OVERRIDE {
   }
 
   virtual bool IsAudioMuted() const OVERRIDE {
     return muted_;
   }
 
@@ skipping 46 matching lines @@
 
   virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE {
   }
 
   virtual void SwitchIME(const std::string& ime_id) OVERRIDE {
   }
 
   virtual void ActivateIMEProperty(const std::string& key) OVERRIDE {
   }
 
-  virtual void CancelDriveOperation(const FilePath&) OVERRIDE {
-  }
-
-  virtual void GetDriveOperationStatusList(
-      ash::DriveOperationStatusList*) OVERRIDE {
-  }
-
   virtual void GetMostRelevantNetworkIcon(NetworkIconInfo* info,
                                           bool large) OVERRIDE {
   }
 
   virtual void GetAvailableNetworks(
       std::vector<NetworkIconInfo>* list) OVERRIDE {
   }
 
   virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE {
   }
@@ skipping 530 matching lines @@
     panel_container->SetLayoutManager(panel_layout_manager_);
   }
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash