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

Side by Side Diff: ash/accelerators/accelerator_controller_delegate_aura.h

Issue 2748173002: chromeos: Show deprecated accelerator notifications in mash (Closed)
Patch Set: rebase Created 3 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
« no previous file with comments | « no previous file | ash/accelerators/accelerator_controller_delegate_aura.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_ACCELERATORS_ACCELERATOR_HANDLER_AURA_H_ 5 #ifndef ASH_ACCELERATORS_ACCELERATOR_HANDLER_AURA_H_
6 #define ASH_ACCELERATORS_ACCELERATOR_HANDLER_AURA_H_ 6 #define ASH_ACCELERATORS_ACCELERATOR_HANDLER_AURA_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/common/accelerators/accelerator_controller_delegate.h" 10 #include "ash/common/accelerators/accelerator_controller_delegate.h"
(...skipping 18 matching lines...) Expand all
29 return screenshot_delegate_.get(); 29 return screenshot_delegate_.get();
30 } 30 }
31 31
32 // AcceleratorControllerDelegate: 32 // AcceleratorControllerDelegate:
33 bool HandlesAction(AcceleratorAction action) override; 33 bool HandlesAction(AcceleratorAction action) override;
34 bool CanPerformAction(AcceleratorAction action, 34 bool CanPerformAction(AcceleratorAction action,
35 const ui::Accelerator& accelerator, 35 const ui::Accelerator& accelerator,
36 const ui::Accelerator& previous_accelerator) override; 36 const ui::Accelerator& previous_accelerator) override;
37 void PerformAction(AcceleratorAction action, 37 void PerformAction(AcceleratorAction action,
38 const ui::Accelerator& accelerator) override; 38 const ui::Accelerator& accelerator) override;
39 void ShowDeprecatedAcceleratorNotification(const char* const notification_id,
40 int message_id,
41 int old_shortcut_id,
42 int new_shortcut_id) override;
43 39
44 private: 40 private:
45 std::unique_ptr<ScreenshotDelegate> screenshot_delegate_; 41 std::unique_ptr<ScreenshotDelegate> screenshot_delegate_;
46 42
47 DISALLOW_COPY_AND_ASSIGN(AcceleratorControllerDelegateAura); 43 DISALLOW_COPY_AND_ASSIGN(AcceleratorControllerDelegateAura);
48 }; 44 };
49 45
50 } // namespace ash 46 } // namespace ash
51 47
52 #endif // ASH_ACCELERATORS_ACCELERATOR_HANDLER_AURA_H_ 48 #endif // ASH_ACCELERATORS_ACCELERATOR_HANDLER_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | ash/accelerators/accelerator_controller_delegate_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698