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

Side by Side Diff: ash/shell.h

Issue 10825081: Fix the comment of overlay_filter_ in Shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | « no previous file | no next file » | 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 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 scoped_ptr<internal::MagnificationController> magnification_controller_; 439 scoped_ptr<internal::MagnificationController> magnification_controller_;
440 scoped_ptr<aura::FocusManager> focus_manager_; 440 scoped_ptr<aura::FocusManager> focus_manager_;
441 scoped_ptr<aura::client::UserActionClient> user_action_client_; 441 scoped_ptr<aura::client::UserActionClient> user_action_client_;
442 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_; 442 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
443 scoped_ptr<internal::ScreenPositionController> screen_position_controller_; 443 scoped_ptr<internal::ScreenPositionController> screen_position_controller_;
444 444
445 // An event filter that rewrites or drops an event. 445 // An event filter that rewrites or drops an event.
446 scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_; 446 scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_;
447 447
448 // An event filter that pre-handles key events while the partial 448 // An event filter that pre-handles key events while the partial
449 // screenshot UI is active. 449 // screenshot UI or the keyboard overlay is active.
450 scoped_ptr<internal::OverlayEventFilter> overlay_filter_; 450 scoped_ptr<internal::OverlayEventFilter> overlay_filter_;
451 451
452 // An event filter which handles system level gestures 452 // An event filter which handles system level gestures
453 scoped_ptr<internal::SystemGestureEventFilter> system_gesture_filter_; 453 scoped_ptr<internal::SystemGestureEventFilter> system_gesture_filter_;
454 454
455 #if !defined(OS_MACOSX) 455 #if !defined(OS_MACOSX)
456 // An event filter that pre-handles global accelerators. 456 // An event filter that pre-handles global accelerators.
457 scoped_ptr<internal::AcceleratorFilter> accelerator_filter_; 457 scoped_ptr<internal::AcceleratorFilter> accelerator_filter_;
458 #endif 458 #endif
459 459
(...skipping 26 matching lines...) Expand all
486 486
487 // Used by ash/shell. 487 // Used by ash/shell.
488 content::BrowserContext* browser_context_; 488 content::BrowserContext* browser_context_;
489 489
490 DISALLOW_COPY_AND_ASSIGN(Shell); 490 DISALLOW_COPY_AND_ASSIGN(Shell);
491 }; 491 };
492 492
493 } // namespace ash 493 } // namespace ash
494 494
495 #endif // ASH_SHELL_H_ 495 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698