| OLD | NEW |
| 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 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 | 302 |
| 303 virtual void ShowDateSettings() OVERRIDE { | 303 virtual void ShowDateSettings() OVERRIDE { |
| 304 } | 304 } |
| 305 | 305 |
| 306 virtual void ShowNetworkSettings() OVERRIDE { | 306 virtual void ShowNetworkSettings() OVERRIDE { |
| 307 } | 307 } |
| 308 | 308 |
| 309 virtual void ShowBluetoothSettings() OVERRIDE { | 309 virtual void ShowBluetoothSettings() OVERRIDE { |
| 310 } | 310 } |
| 311 | 311 |
| 312 virtual void ShowDriveSettings() OVERRIDE { |
| 313 } |
| 314 |
| 312 virtual void ShowIMESettings() OVERRIDE { | 315 virtual void ShowIMESettings() OVERRIDE { |
| 313 } | 316 } |
| 314 | 317 |
| 315 virtual void ShowHelp() OVERRIDE { | 318 virtual void ShowHelp() OVERRIDE { |
| 316 } | 319 } |
| 317 | 320 |
| 318 virtual bool IsAudioMuted() const OVERRIDE { | 321 virtual bool IsAudioMuted() const OVERRIDE { |
| 319 return muted_; | 322 return muted_; |
| 320 } | 323 } |
| 321 | 324 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 368 | 371 |
| 369 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE { | 372 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE { |
| 370 } | 373 } |
| 371 | 374 |
| 372 virtual void SwitchIME(const std::string& ime_id) OVERRIDE { | 375 virtual void SwitchIME(const std::string& ime_id) OVERRIDE { |
| 373 } | 376 } |
| 374 | 377 |
| 375 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE { | 378 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE { |
| 376 } | 379 } |
| 377 | 380 |
| 381 virtual void CancelDriveOperation(const FilePath&) OVERRIDE { |
| 382 } |
| 383 |
| 384 virtual void GetDriveOperationStatusList( |
| 385 ash::DriveOperationStatusList*) OVERRIDE { |
| 386 } |
| 387 |
| 378 virtual void GetMostRelevantNetworkIcon(NetworkIconInfo* info, | 388 virtual void GetMostRelevantNetworkIcon(NetworkIconInfo* info, |
| 379 bool large) OVERRIDE { | 389 bool large) OVERRIDE { |
| 380 } | 390 } |
| 381 | 391 |
| 382 virtual void GetAvailableNetworks( | 392 virtual void GetAvailableNetworks( |
| 383 std::vector<NetworkIconInfo>* list) OVERRIDE { | 393 std::vector<NetworkIconInfo>* list) OVERRIDE { |
| 384 } | 394 } |
| 385 | 395 |
| 386 virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE { | 396 virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE { |
| 387 } | 397 } |
| (...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 918 panel_container->SetLayoutManager(panel_layout_manager_); | 928 panel_container->SetLayoutManager(panel_layout_manager_); |
| 919 } | 929 } |
| 920 } | 930 } |
| 921 | 931 |
| 922 void Shell::DisableWorkspaceGridLayout() { | 932 void Shell::DisableWorkspaceGridLayout() { |
| 923 if (workspace_controller_.get()) | 933 if (workspace_controller_.get()) |
| 924 workspace_controller_->workspace_manager()->set_grid_size(0); | 934 workspace_controller_->workspace_manager()->set_grid_size(0); |
| 925 } | 935 } |
| 926 | 936 |
| 927 } // namespace ash | 937 } // namespace ash |
| OLD | NEW |