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

Side by Side Diff: ash/shell.h

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