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

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
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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 virtual int GetSystemUpdateIconResource() const OVERRIDE { 247 virtual int GetSystemUpdateIconResource() const OVERRIDE {
248 return IDR_AURA_UBER_TRAY_UPDATE; 248 return IDR_AURA_UBER_TRAY_UPDATE;
249 } 249 }
250 250
251 virtual void ShowSettings() OVERRIDE { 251 virtual void ShowSettings() OVERRIDE {
252 } 252 }
253 253
254 virtual void ShowDateSettings() OVERRIDE { 254 virtual void ShowDateSettings() OVERRIDE {
255 } 255 }
256 256
257 virtual void ShowNetworkSettings() OVERRIDE {
258 }
259
257 virtual void ShowHelp() OVERRIDE { 260 virtual void ShowHelp() OVERRIDE {
258 } 261 }
259 262
260 virtual bool IsAudioMuted() const OVERRIDE { 263 virtual bool IsAudioMuted() const OVERRIDE {
261 return muted_; 264 return muted_;
262 } 265 }
263 266
264 virtual void SetAudioMuted(bool muted) OVERRIDE { 267 virtual void SetAudioMuted(bool muted) OVERRIDE {
265 muted_ = muted; 268 muted_ = muted;
266 } 269 }
267 270
268 virtual float GetVolumeLevel() const OVERRIDE { 271 virtual float GetVolumeLevel() const OVERRIDE {
269 return volume_; 272 return volume_;
270 } 273 }
271 274
272 virtual void SetVolumeLevel(float volume) OVERRIDE { 275 virtual void SetVolumeLevel(float volume) OVERRIDE {
273 volume_ = volume; 276 volume_ = volume;
274 } 277 }
275 278
276 virtual void ShutDown() OVERRIDE {} 279 virtual void ShutDown() OVERRIDE {}
277 virtual void SignOut() OVERRIDE {} 280 virtual void SignOut() OVERRIDE {}
278 virtual void RequestLockScreen() OVERRIDE {} 281 virtual void RequestLockScreen() OVERRIDE {}
279 virtual NetworkIconInfo GetMostRelevantNetworkIcon() { 282 virtual NetworkIconInfo GetMostRelevantNetworkIcon(bool large) OVERRIDE {
280 return NetworkIconInfo(); 283 return NetworkIconInfo();
281 } 284 }
285 virtual void GetAvailableNetworks(
286 std::vector<NetworkIconInfo>* list) OVERRIDE {
287 }
288
289 virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE {
290 }
291
292 virtual void ToggleAirplaneMode() OVERRIDE {
293 }
294
295 virtual void ChangeProxySettings() OVERRIDE {
296 }
282 297
283 bool muted_; 298 bool muted_;
284 float volume_; 299 float volume_;
285 SkBitmap null_image_; 300 SkBitmap null_image_;
286 301
287 DISALLOW_COPY_AND_ASSIGN(DummySystemTrayDelegate); 302 DISALLOW_COPY_AND_ASSIGN(DummySystemTrayDelegate);
288 }; 303 };
289 304
290 } // namespace 305 } // namespace
291 306
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 // Create the desktop background image. 674 // Create the desktop background image.
660 SetDesktopBackgroundMode(BACKGROUND_IMAGE); 675 SetDesktopBackgroundMode(BACKGROUND_IMAGE);
661 } 676 }
662 677
663 void Shell::DisableWorkspaceGridLayout() { 678 void Shell::DisableWorkspaceGridLayout() {
664 if (workspace_controller_.get()) 679 if (workspace_controller_.get())
665 workspace_controller_->workspace_manager()->set_grid_size(0); 680 workspace_controller_->workspace_manager()->set_grid_size(0);
666 } 681 }
667 682
668 } // namespace ash 683 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698