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

Side by Side Diff: ash/shell.cc

Issue 9664056: ash uber tray: Add the detailed network popup (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
« no previous file with comments | « ash/ash_strings.grd ('k') | ash/system/network/tray_network.h » ('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 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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 virtual base::HourClockType GetHourClockType() const OVERRIDE { 251 virtual base::HourClockType GetHourClockType() const OVERRIDE {
252 return base::k24HourClock; 252 return base::k24HourClock;
253 } 253 }
254 254
255 virtual void ShowSettings() OVERRIDE { 255 virtual void ShowSettings() OVERRIDE {
256 } 256 }
257 257
258 virtual void ShowDateSettings() OVERRIDE { 258 virtual void ShowDateSettings() OVERRIDE {
259 } 259 }
260 260
261 virtual void ShowNetworkSettings() OVERRIDE {
262 }
263
261 virtual void ShowHelp() OVERRIDE { 264 virtual void ShowHelp() OVERRIDE {
262 } 265 }
263 266
264 virtual bool IsAudioMuted() const OVERRIDE { 267 virtual bool IsAudioMuted() const OVERRIDE {
265 return muted_; 268 return muted_;
266 } 269 }
267 270
268 virtual void SetAudioMuted(bool muted) OVERRIDE { 271 virtual void SetAudioMuted(bool muted) OVERRIDE {
269 muted_ = muted; 272 muted_ = muted;
270 } 273 }
271 274
272 virtual float GetVolumeLevel() const OVERRIDE { 275 virtual float GetVolumeLevel() const OVERRIDE {
273 return volume_; 276 return volume_;
274 } 277 }
275 278
276 virtual void SetVolumeLevel(float volume) OVERRIDE { 279 virtual void SetVolumeLevel(float volume) OVERRIDE {
277 volume_ = volume; 280 volume_ = volume;
278 } 281 }
279 282
280 virtual void ShutDown() OVERRIDE {} 283 virtual void ShutDown() OVERRIDE {}
281 virtual void SignOut() OVERRIDE {} 284 virtual void SignOut() OVERRIDE {}
282 virtual void RequestLockScreen() OVERRIDE {} 285 virtual void RequestLockScreen() OVERRIDE {}
283 virtual NetworkIconInfo GetMostRelevantNetworkIcon() { 286 virtual NetworkIconInfo GetMostRelevantNetworkIcon(bool large) OVERRIDE {
284 return NetworkIconInfo(); 287 return NetworkIconInfo();
285 } 288 }
289 virtual void GetAvailableNetworks(
290 std::vector<NetworkIconInfo>* list) OVERRIDE {
291 }
292
293 virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE {
294 }
295
296 virtual void ToggleAirplaneMode() OVERRIDE {
297 }
298
299 virtual void ChangeProxySettings() OVERRIDE {
300 }
286 301
287 bool muted_; 302 bool muted_;
288 float volume_; 303 float volume_;
289 SkBitmap null_image_; 304 SkBitmap null_image_;
290 305
291 DISALLOW_COPY_AND_ASSIGN(DummySystemTrayDelegate); 306 DISALLOW_COPY_AND_ASSIGN(DummySystemTrayDelegate);
292 }; 307 };
293 308
294 } // namespace 309 } // namespace
295 310
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 // Create the desktop background image. 680 // Create the desktop background image.
666 SetDesktopBackgroundMode(BACKGROUND_IMAGE); 681 SetDesktopBackgroundMode(BACKGROUND_IMAGE);
667 } 682 }
668 683
669 void Shell::DisableWorkspaceGridLayout() { 684 void Shell::DisableWorkspaceGridLayout() {
670 if (workspace_controller_.get()) 685 if (workspace_controller_.get())
671 workspace_controller_->workspace_manager()->set_grid_size(0); 686 workspace_controller_->workspace_manager()->set_grid_size(0);
672 } 687 }
673 688
674 } // namespace ash 689 } // namespace ash
OLDNEW
« no previous file with comments | « ash/ash_strings.grd ('k') | ash/system/network/tray_network.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698