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

Side by Side Diff: ash/shell.cc

Issue 9580024: ash uber tray: Allow customizing each item depending on whether the user is logged in or not. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missing file 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/audio/tray_volume.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"
11 #include "ash/drag_drop/drag_drop_controller.h" 11 #include "ash/drag_drop/drag_drop_controller.h"
12 #include "ash/focus_cycler.h" 12 #include "ash/focus_cycler.h"
13 #include "ash/ime/input_method_event_filter.h" 13 #include "ash/ime/input_method_event_filter.h"
14 #include "ash/launcher/launcher.h" 14 #include "ash/launcher/launcher.h"
15 #include "ash/shell_delegate.h" 15 #include "ash/shell_delegate.h"
16 #include "ash/shell_factory.h" 16 #include "ash/shell_factory.h"
17 #include "ash/shell_window_ids.h" 17 #include "ash/shell_window_ids.h"
18 #include "ash/system/audio/tray_volume.h" 18 #include "ash/system/audio/tray_volume.h"
19 #include "ash/system/brightness/tray_brightness.h" 19 #include "ash/system/brightness/tray_brightness.h"
20 #include "ash/system/settings/tray_settings.h" 20 #include "ash/system/settings/tray_settings.h"
21 #include "ash/system/power/power_status_controller.h" 21 #include "ash/system/power/power_status_controller.h"
22 #include "ash/system/power/tray_power_date.h" 22 #include "ash/system/power/tray_power_date.h"
23 #include "ash/system/tray/system_tray_delegate.h" 23 #include "ash/system/tray/system_tray_delegate.h"
24 #include "ash/system/tray/system_tray.h" 24 #include "ash/system/tray/system_tray.h"
25 #include "ash/system/tray_user.h" 25 #include "ash/system/user/tray_user.h"
26 #include "ash/tooltips/tooltip_controller.h" 26 #include "ash/tooltips/tooltip_controller.h"
27 #include "ash/wm/activation_controller.h" 27 #include "ash/wm/activation_controller.h"
28 #include "ash/wm/base_layout_manager.h" 28 #include "ash/wm/base_layout_manager.h"
29 #include "ash/wm/compact_layout_manager.h" 29 #include "ash/wm/compact_layout_manager.h"
30 #include "ash/wm/compact_status_area_layout_manager.h" 30 #include "ash/wm/compact_status_area_layout_manager.h"
31 #include "ash/wm/dialog_frame_view.h" 31 #include "ash/wm/dialog_frame_view.h"
32 #include "ash/wm/panel_window_event_filter.h" 32 #include "ash/wm/panel_window_event_filter.h"
33 #include "ash/wm/panel_layout_manager.h" 33 #include "ash/wm/panel_layout_manager.h"
34 #include "ash/wm/partial_screenshot_event_filter.h" 34 #include "ash/wm/partial_screenshot_event_filter.h"
35 #include "ash/wm/power_button_controller.h" 35 #include "ash/wm/power_button_controller.h"
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 } 198 }
199 199
200 virtual const std::string GetUserEmail() OVERRIDE { 200 virtual const std::string GetUserEmail() OVERRIDE {
201 return "chr@nos"; 201 return "chr@nos";
202 } 202 }
203 203
204 virtual const SkBitmap& GetUserImage() OVERRIDE { 204 virtual const SkBitmap& GetUserImage() OVERRIDE {
205 return null_image_; 205 return null_image_;
206 } 206 }
207 207
208 virtual user::LoginStatus GetUserLoginStatus() OVERRIDE {
209 return user::LOGGED_IN_USER;
210 }
211
208 virtual void ShowSettings() OVERRIDE { 212 virtual void ShowSettings() OVERRIDE {
209 } 213 }
210 214
211 virtual void ShowHelp() OVERRIDE { 215 virtual void ShowHelp() OVERRIDE {
212 } 216 }
213 217
214 virtual bool IsAudioMuted() const OVERRIDE { 218 virtual bool IsAudioMuted() const OVERRIDE {
215 return muted_; 219 return muted_;
216 } 220 }
217 221
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 669
666 // Create the desktop background image. 670 // Create the desktop background image.
667 SetDesktopBackgroundMode(BACKGROUND_IMAGE); 671 SetDesktopBackgroundMode(BACKGROUND_IMAGE);
668 } 672 }
669 673
670 void Shell::ResetLayoutManager(int container_id) { 674 void Shell::ResetLayoutManager(int container_id) {
671 GetContainer(container_id)->SetLayoutManager(NULL); 675 GetContainer(container_id)->SetLayoutManager(NULL);
672 } 676 }
673 677
674 } // namespace ash 678 } // namespace ash
OLDNEW
« no previous file with comments | « ash/ash_strings.grd ('k') | ash/system/audio/tray_volume.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698