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

Side by Side Diff: ash/shell.h

Issue 9702024: ash: Take the 24h clock pref into consideration when showing the time. (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.gyp ('k') | ash/shell.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 #ifndef ASH_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 24 matching lines...) Expand all
35 namespace views { 35 namespace views {
36 class NonClientFrameView; 36 class NonClientFrameView;
37 class Widget; 37 class Widget;
38 } 38 }
39 39
40 namespace ash { 40 namespace ash {
41 41
42 class AcceleratorController; 42 class AcceleratorController;
43 class AudioController; 43 class AudioController;
44 class BrightnessController; 44 class BrightnessController;
45 class DateFormatObserver;
45 class Launcher; 46 class Launcher;
46 class NestedDispatcherController; 47 class NestedDispatcherController;
47 class NetworkController; 48 class NetworkController;
48 class PowerButtonController; 49 class PowerButtonController;
49 class PowerStatusController; 50 class PowerStatusController;
50 class ScreenAsh; 51 class ScreenAsh;
51 class ShellDelegate; 52 class ShellDelegate;
52 class ShellObserver; 53 class ShellObserver;
53 class SystemTrayDelegate; 54 class SystemTrayDelegate;
54 class SystemTray; 55 class SystemTray;
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 } 191 }
191 internal::FocusCycler* focus_cycler() { 192 internal::FocusCycler* focus_cycler() {
192 return focus_cycler_.get(); 193 return focus_cycler_.get();
193 } 194 }
194 AudioController* audio_controller() const { 195 AudioController* audio_controller() const {
195 return audio_controller_; 196 return audio_controller_;
196 } 197 }
197 BrightnessController* brightness_controller() const { 198 BrightnessController* brightness_controller() const {
198 return brightness_controller_; 199 return brightness_controller_;
199 } 200 }
201 DateFormatObserver* date_format_observer() const {
202 return date_format_observer_;
203 }
200 NetworkController* network_controller() const { 204 NetworkController* network_controller() const {
201 return network_controller_; 205 return network_controller_;
202 } 206 }
203 PowerStatusController* power_status_controller() const { 207 PowerStatusController* power_status_controller() const {
204 return power_status_controller_; 208 return power_status_controller_;
205 } 209 }
206 UpdateController* update_controller() const { 210 UpdateController* update_controller() const {
207 return update_controller_; 211 return update_controller_;
208 } 212 }
209 213
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 scoped_ptr<internal::TooltipController> tooltip_controller_; 283 scoped_ptr<internal::TooltipController> tooltip_controller_;
280 scoped_ptr<internal::VisibilityController> visibility_controller_; 284 scoped_ptr<internal::VisibilityController> visibility_controller_;
281 scoped_ptr<PowerButtonController> power_button_controller_; 285 scoped_ptr<PowerButtonController> power_button_controller_;
282 scoped_ptr<VideoDetector> video_detector_; 286 scoped_ptr<VideoDetector> video_detector_;
283 scoped_ptr<WindowCycleController> window_cycle_controller_; 287 scoped_ptr<WindowCycleController> window_cycle_controller_;
284 scoped_ptr<internal::FocusCycler> focus_cycler_; 288 scoped_ptr<internal::FocusCycler> focus_cycler_;
285 289
286 // These controllers are not owned by the shell. 290 // These controllers are not owned by the shell.
287 AudioController* audio_controller_; 291 AudioController* audio_controller_;
288 BrightnessController* brightness_controller_; 292 BrightnessController* brightness_controller_;
293 DateFormatObserver* date_format_observer_;
289 NetworkController* network_controller_; 294 NetworkController* network_controller_;
290 PowerStatusController* power_status_controller_; 295 PowerStatusController* power_status_controller_;
291 UpdateController* update_controller_; 296 UpdateController* update_controller_;
292 297
293 // An event filter that pre-handles all key events to send them to an IME. 298 // An event filter that pre-handles all key events to send them to an IME.
294 scoped_ptr<internal::InputMethodEventFilter> input_method_filter_; 299 scoped_ptr<internal::InputMethodEventFilter> input_method_filter_;
295 300
296 // An event filter that pre-handles key events while the partial 301 // An event filter that pre-handles key events while the partial
297 // screenshot UI is active. 302 // screenshot UI is active.
298 scoped_ptr<internal::PartialScreenshotEventFilter> partial_screenshot_filter_; 303 scoped_ptr<internal::PartialScreenshotEventFilter> partial_screenshot_filter_;
(...skipping 22 matching lines...) Expand all
321 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for 326 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for
322 // |status_widget_|). 327 // |status_widget_|).
323 scoped_ptr<SystemTray> tray_; 328 scoped_ptr<SystemTray> tray_;
324 329
325 DISALLOW_COPY_AND_ASSIGN(Shell); 330 DISALLOW_COPY_AND_ASSIGN(Shell);
326 }; 331 };
327 332
328 } // namespace ash 333 } // namespace ash
329 334
330 #endif // ASH_SHELL_H_ 335 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698