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

Side by Side Diff: ash/shell.h

Issue 10407089: Revert 138212 - Implement High Contrast mode for Chrome OS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « ash/high_contrast/high_contrast_controller.cc ('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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 } 46 }
47 namespace views { 47 namespace views {
48 class NonClientFrameView; 48 class NonClientFrameView;
49 class Widget; 49 class Widget;
50 } 50 }
51 51
52 namespace ash { 52 namespace ash {
53 53
54 class AcceleratorController; 54 class AcceleratorController;
55 class DesktopBackgroundController; 55 class DesktopBackgroundController;
56 class HighContrastController;
57 class Launcher; 56 class Launcher;
58 class NestedDispatcherController; 57 class NestedDispatcherController;
59 class PowerButtonController; 58 class PowerButtonController;
60 class ScreenAsh; 59 class ScreenAsh;
61 class ShellDelegate; 60 class ShellDelegate;
62 class ShellObserver; 61 class ShellObserver;
63 class SystemTrayDelegate; 62 class SystemTrayDelegate;
64 class SystemTray; 63 class SystemTray;
65 class UserWallpaperDelegate; 64 class UserWallpaperDelegate;
66 class VideoDetector; 65 class VideoDetector;
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 internal::FocusCycler* focus_cycler() { 230 internal::FocusCycler* focus_cycler() {
232 return focus_cycler_.get(); 231 return focus_cycler_.get();
233 } 232 }
234 233
235 ShellDelegate* delegate() { return delegate_.get(); } 234 ShellDelegate* delegate() { return delegate_.get(); }
236 SystemTrayDelegate* tray_delegate() { return tray_delegate_.get(); } 235 SystemTrayDelegate* tray_delegate() { return tray_delegate_.get(); }
237 UserWallpaperDelegate* user_wallpaper_delegate() { 236 UserWallpaperDelegate* user_wallpaper_delegate() {
238 return user_wallpaper_delegate_.get(); 237 return user_wallpaper_delegate_.get();
239 } 238 }
240 239
241 HighContrastController* high_contrast_controller() {
242 return high_contrast_controller_.get();
243 }
244
245 internal::MagnificationController* magnification_controller() { 240 internal::MagnificationController* magnification_controller() {
246 return magnification_controller_.get(); 241 return magnification_controller_.get();
247 } 242 }
248
249 internal::ScreenDimmer* screen_dimmer() { 243 internal::ScreenDimmer* screen_dimmer() {
250 return screen_dimmer_.get(); 244 return screen_dimmer_.get();
251 } 245 }
252 246
253 Launcher* launcher() { return launcher_.get(); } 247 Launcher* launcher() { return launcher_.get(); }
254 248
255 const ScreenAsh* screen() { return screen_; } 249 const ScreenAsh* screen() { return screen_; }
256 250
257 // Force the shelf to query for it's current visibility state. 251 // Force the shelf to query for it's current visibility state.
258 void UpdateShelfVisibility(); 252 void UpdateShelfVisibility();
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 scoped_ptr<internal::ShadowController> shadow_controller_; 341 scoped_ptr<internal::ShadowController> shadow_controller_;
348 scoped_ptr<internal::TooltipController> tooltip_controller_; 342 scoped_ptr<internal::TooltipController> tooltip_controller_;
349 scoped_ptr<internal::VisibilityController> visibility_controller_; 343 scoped_ptr<internal::VisibilityController> visibility_controller_;
350 scoped_ptr<DesktopBackgroundController> desktop_background_controller_; 344 scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
351 scoped_ptr<PowerButtonController> power_button_controller_; 345 scoped_ptr<PowerButtonController> power_button_controller_;
352 scoped_ptr<VideoDetector> video_detector_; 346 scoped_ptr<VideoDetector> video_detector_;
353 scoped_ptr<WindowCycleController> window_cycle_controller_; 347 scoped_ptr<WindowCycleController> window_cycle_controller_;
354 scoped_ptr<internal::FocusCycler> focus_cycler_; 348 scoped_ptr<internal::FocusCycler> focus_cycler_;
355 scoped_ptr<internal::EventClientImpl> event_client_; 349 scoped_ptr<internal::EventClientImpl> event_client_;
356 scoped_ptr<internal::MonitorController> monitor_controller_; 350 scoped_ptr<internal::MonitorController> monitor_controller_;
357 scoped_ptr<HighContrastController> high_contrast_controller_;
358 scoped_ptr<internal::MagnificationController> magnification_controller_; 351 scoped_ptr<internal::MagnificationController> magnification_controller_;
359 scoped_ptr<internal::ScreenDimmer> screen_dimmer_; 352 scoped_ptr<internal::ScreenDimmer> screen_dimmer_;
360 353
361 // An event filter that rewrites or drops a key event. 354 // An event filter that rewrites or drops a key event.
362 scoped_ptr<internal::KeyRewriterEventFilter> key_rewriter_filter_; 355 scoped_ptr<internal::KeyRewriterEventFilter> key_rewriter_filter_;
363 356
364 // An event filter that pre-handles key events while the partial 357 // An event filter that pre-handles key events while the partial
365 // screenshot UI is active. 358 // screenshot UI is active.
366 scoped_ptr<internal::PartialScreenshotEventFilter> partial_screenshot_filter_; 359 scoped_ptr<internal::PartialScreenshotEventFilter> partial_screenshot_filter_;
367 360
(...skipping 30 matching lines...) Expand all
398 391
399 // Used by ash/shell. 392 // Used by ash/shell.
400 content::BrowserContext* browser_context_; 393 content::BrowserContext* browser_context_;
401 394
402 DISALLOW_COPY_AND_ASSIGN(Shell); 395 DISALLOW_COPY_AND_ASSIGN(Shell);
403 }; 396 };
404 397
405 } // namespace ash 398 } // namespace ash
406 399
407 #endif // ASH_SHELL_H_ 400 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/high_contrast/high_contrast_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698