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

Side by Side Diff: athena/screen/screen_accelerator_handler.h

Issue 665803003: Revert of Support modal windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Created 6 years, 2 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 | « athena/screen/public/screen_manager.h ('k') | athena/screen/screen_manager_impl.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef ATHENA_SCREEN_SCREEN_ACCELERATOR_HANDLER_H_
5 #define ATHENA_SCREEN_SCREEN_ACCELERATOR_HANDLER_H_
6 4
7 #include "athena/input/public/accelerator_manager.h" 5 #include "athena/input/public/accelerator_manager.h"
8 6
9 #include "base/macros.h" 7 #include "base/macros.h"
10 8
11 namespace aura { 9 namespace aura {
12 class Window; 10 class Window;
13 } 11 }
14 12
15 namespace athena { 13 namespace athena {
(...skipping 10 matching lines...) Expand all
26 virtual bool IsCommandEnabled(int command_id) const override; 24 virtual bool IsCommandEnabled(int command_id) const override;
27 virtual bool OnAcceleratorFired(int command_id, 25 virtual bool OnAcceleratorFired(int command_id,
28 const ui::Accelerator& accelerator) override; 26 const ui::Accelerator& accelerator) override;
29 27
30 aura::Window* root_window_; 28 aura::Window* root_window_;
31 29
32 DISALLOW_COPY_AND_ASSIGN(ScreenAcceleratorHandler); 30 DISALLOW_COPY_AND_ASSIGN(ScreenAcceleratorHandler);
33 }; 31 };
34 32
35 } // namespace athena 33 } // namespace athena
36
37 #endif // ATHENA_SCREEN_SCREEN_ACCELERATOR_HANDLER_H_
OLDNEW
« no previous file with comments | « athena/screen/public/screen_manager.h ('k') | athena/screen/screen_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698