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

Side by Side Diff: ash/shell.h

Issue 9838010: Automatically remap Command key on an Apple keyboard to Control [part 1 of 2 - Ash part] (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review fix 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/key_rewriter_delegate.h ('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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 class WindowCycleController; 56 class WindowCycleController;
57 57
58 namespace internal { 58 namespace internal {
59 class ActivationController; 59 class ActivationController;
60 class AcceleratorFilter; 60 class AcceleratorFilter;
61 class AppList; 61 class AppList;
62 class DragDropController; 62 class DragDropController;
63 class EventClientImpl; 63 class EventClientImpl;
64 class FocusCycler; 64 class FocusCycler;
65 class InputMethodEventFilter; 65 class InputMethodEventFilter;
66 class KeyRewriterEventFilter;
66 class MonitorController; 67 class MonitorController;
67 class PartialScreenshotEventFilter; 68 class PartialScreenshotEventFilter;
68 class ResizeShadowController; 69 class ResizeShadowController;
69 class RootWindowEventFilter; 70 class RootWindowEventFilter;
70 class RootWindowLayoutManager; 71 class RootWindowLayoutManager;
71 class ShadowController; 72 class ShadowController;
72 class ShelfLayoutManager; 73 class ShelfLayoutManager;
73 class StackingController; 74 class StackingController;
74 class TooltipController; 75 class TooltipController;
75 class VisibilityController; 76 class VisibilityController;
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 return accelerator_controller_.get(); 171 return accelerator_controller_.get();
171 } 172 }
172 #endif // !defined(OS_MACOSX) 173 #endif // !defined(OS_MACOSX)
173 174
174 internal::RootWindowEventFilter* root_filter() { 175 internal::RootWindowEventFilter* root_filter() {
175 return root_filter_; 176 return root_filter_;
176 } 177 }
177 internal::TooltipController* tooltip_controller() { 178 internal::TooltipController* tooltip_controller() {
178 return tooltip_controller_.get(); 179 return tooltip_controller_.get();
179 } 180 }
181 internal::KeyRewriterEventFilter* key_rewriter_filter() {
182 return key_rewriter_filter_.get();
183 }
180 internal::PartialScreenshotEventFilter* partial_screenshot_filter() { 184 internal::PartialScreenshotEventFilter* partial_screenshot_filter() {
181 return partial_screenshot_filter_.get(); 185 return partial_screenshot_filter_.get();
182 } 186 }
183 DesktopBackgroundController* desktop_background_controller() { 187 DesktopBackgroundController* desktop_background_controller() {
184 return desktop_background_controller_.get(); 188 return desktop_background_controller_.get();
185 } 189 }
186 PowerButtonController* power_button_controller() { 190 PowerButtonController* power_button_controller() {
187 return power_button_controller_.get(); 191 return power_button_controller_.get();
188 } 192 }
189 VideoDetector* video_detector() { 193 VideoDetector* video_detector() {
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 scoped_ptr<internal::TooltipController> tooltip_controller_; 292 scoped_ptr<internal::TooltipController> tooltip_controller_;
289 scoped_ptr<internal::VisibilityController> visibility_controller_; 293 scoped_ptr<internal::VisibilityController> visibility_controller_;
290 scoped_ptr<DesktopBackgroundController> desktop_background_controller_; 294 scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
291 scoped_ptr<PowerButtonController> power_button_controller_; 295 scoped_ptr<PowerButtonController> power_button_controller_;
292 scoped_ptr<VideoDetector> video_detector_; 296 scoped_ptr<VideoDetector> video_detector_;
293 scoped_ptr<WindowCycleController> window_cycle_controller_; 297 scoped_ptr<WindowCycleController> window_cycle_controller_;
294 scoped_ptr<internal::FocusCycler> focus_cycler_; 298 scoped_ptr<internal::FocusCycler> focus_cycler_;
295 scoped_ptr<internal::EventClientImpl> event_client_; 299 scoped_ptr<internal::EventClientImpl> event_client_;
296 scoped_ptr<internal::MonitorController> monitor_controller_; 300 scoped_ptr<internal::MonitorController> monitor_controller_;
297 301
298 // An event filter that pre-handles all key events to send them to an IME. 302 // An event filter that rewrites or drops a key event.
299 scoped_ptr<internal::InputMethodEventFilter> input_method_filter_; 303 scoped_ptr<internal::KeyRewriterEventFilter> key_rewriter_filter_;
300 304
301 // An event filter that pre-handles key events while the partial 305 // An event filter that pre-handles key events while the partial
302 // screenshot UI is active. 306 // screenshot UI is active.
303 scoped_ptr<internal::PartialScreenshotEventFilter> partial_screenshot_filter_; 307 scoped_ptr<internal::PartialScreenshotEventFilter> partial_screenshot_filter_;
304 308
305 #if !defined(OS_MACOSX) 309 #if !defined(OS_MACOSX)
306 // An event filter that pre-handles global accelerators. 310 // An event filter that pre-handles global accelerators.
307 scoped_ptr<internal::AcceleratorFilter> accelerator_filter_; 311 scoped_ptr<internal::AcceleratorFilter> accelerator_filter_;
308 #endif 312 #endif
309 313
314 // An event filter that pre-handles all key events to send them to an IME.
315 scoped_ptr<internal::InputMethodEventFilter> input_method_filter_;
316
310 // The shelf for managing the launcher and the status widget in non-compact 317 // The shelf for managing the launcher and the status widget in non-compact
311 // mode. Shell does not own the shelf. Instead, it is owned by container of 318 // mode. Shell does not own the shelf. Instead, it is owned by container of
312 // the status area. 319 // the status area.
313 internal::ShelfLayoutManager* shelf_; 320 internal::ShelfLayoutManager* shelf_;
314 321
315 ObserverList<ShellObserver> observers_; 322 ObserverList<ShellObserver> observers_;
316 323
317 // Owned by aura::RootWindow, cached here for type safety. 324 // Owned by aura::RootWindow, cached here for type safety.
318 internal::RootWindowLayoutManager* root_window_layout_; 325 internal::RootWindowLayoutManager* root_window_layout_;
319 326
320 // Status area with clock, Wi-Fi signal, etc. 327 // Status area with clock, Wi-Fi signal, etc.
321 views::Widget* status_widget_; 328 views::Widget* status_widget_;
322 329
323 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for 330 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for
324 // |status_widget_|). 331 // |status_widget_|).
325 scoped_ptr<SystemTray> tray_; 332 scoped_ptr<SystemTray> tray_;
326 333
327 DISALLOW_COPY_AND_ASSIGN(Shell); 334 DISALLOW_COPY_AND_ASSIGN(Shell);
328 }; 335 };
329 336
330 } // namespace ash 337 } // namespace ash
331 338
332 #endif // ASH_SHELL_H_ 339 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/key_rewriter_delegate.h ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698