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

Side by Side Diff: ash/shell.cc

Issue 10391182: Fixed proxy settings button behaviour: it becomes disabled when device isn't connected to any netwo… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix, sync. Created 8 years, 7 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
« no previous file with comments | « no previous file | ash/system/network/tray_network.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include <string> 8 #include <string>
9 9
10 #include "ash/accelerators/focus_manager_factory.h" 10 #include "ash/accelerators/focus_manager_factory.h"
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 if (observer) 444 if (observer)
445 observer->OnBluetoothRefresh(); 445 observer->OnBluetoothRefresh();
446 } 446 }
447 447
448 virtual void ShowOtherWifi() OVERRIDE { 448 virtual void ShowOtherWifi() OVERRIDE {
449 } 449 }
450 450
451 virtual void ShowOtherCellular() OVERRIDE { 451 virtual void ShowOtherCellular() OVERRIDE {
452 } 452 }
453 453
454 virtual bool IsNetworkConnected() OVERRIDE {
455 return true;
456 }
457
454 virtual bool GetWifiAvailable() OVERRIDE { 458 virtual bool GetWifiAvailable() OVERRIDE {
455 return true; 459 return true;
456 } 460 }
457 461
458 virtual bool GetMobileAvailable() OVERRIDE { 462 virtual bool GetMobileAvailable() OVERRIDE {
459 return true; 463 return true;
460 } 464 }
461 465
462 virtual bool GetBluetoothAvailable() OVERRIDE { 466 virtual bool GetBluetoothAvailable() OVERRIDE {
463 return true; 467 return true;
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
954 panel_container->SetLayoutManager(panel_layout_manager_); 958 panel_container->SetLayoutManager(panel_layout_manager_);
955 } 959 }
956 } 960 }
957 961
958 void Shell::DisableWorkspaceGridLayout() { 962 void Shell::DisableWorkspaceGridLayout() {
959 if (workspace_controller_.get()) 963 if (workspace_controller_.get())
960 workspace_controller_->workspace_manager()->set_grid_size(0); 964 workspace_controller_->workspace_manager()->set_grid_size(0);
961 } 965 }
962 966
963 } // namespace ash 967 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/system/network/tray_network.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698