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

Side by Side Diff: ash/shell.cc

Issue 9753019: ash: Add a bluetooth entry in the uber tray. (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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "ash/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/app_list/app_list.h" 9 #include "ash/app_list/app_list.h"
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 } 307 }
308 308
309 virtual void ShutDown() OVERRIDE {} 309 virtual void ShutDown() OVERRIDE {}
310 310
311 virtual void SignOut() OVERRIDE { 311 virtual void SignOut() OVERRIDE {
312 MessageLoop::current()->Quit(); 312 MessageLoop::current()->Quit();
313 } 313 }
314 314
315 virtual void RequestLockScreen() OVERRIDE {} 315 virtual void RequestLockScreen() OVERRIDE {}
316 316
317 virtual BluetoothDeviceList GetAvailableBluetoothDevices() OVERRIDE {
318 return BluetoothDeviceList();
319 }
320
317 virtual NetworkIconInfo GetMostRelevantNetworkIcon(bool large) OVERRIDE { 321 virtual NetworkIconInfo GetMostRelevantNetworkIcon(bool large) OVERRIDE {
318 return NetworkIconInfo(); 322 return NetworkIconInfo();
319 } 323 }
320 324
321 virtual void GetAvailableNetworks( 325 virtual void GetAvailableNetworks(
322 std::vector<NetworkIconInfo>* list) OVERRIDE { 326 std::vector<NetworkIconInfo>* list) OVERRIDE {
323 } 327 }
324 328
325 virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE { 329 virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE {
326 } 330 }
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 // Create the desktop background image. 760 // Create the desktop background image.
757 desktop_background_controller_->SetDefaultDesktopBackgroundImage(); 761 desktop_background_controller_->SetDefaultDesktopBackgroundImage();
758 } 762 }
759 763
760 void Shell::DisableWorkspaceGridLayout() { 764 void Shell::DisableWorkspaceGridLayout() {
761 if (workspace_controller_.get()) 765 if (workspace_controller_.get())
762 workspace_controller_->workspace_manager()->set_grid_size(0); 766 workspace_controller_->workspace_manager()->set_grid_size(0);
763 } 767 }
764 768
765 } // namespace ash 769 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698