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

Side by Side Diff: chrome/browser/ui/views/accelerator_table.h

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 years, 3 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
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 CHROME_BROWSER_UI_VIEWS_ACCELERATOR_TABLE_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_ACCELERATOR_TABLE_H_
6 #define CHROME_BROWSER_UI_VIEWS_ACCELERATOR_TABLE_H_ 6 #define CHROME_BROWSER_UI_VIEWS_ACCELERATOR_TABLE_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "chrome/browser/ui/host_desktop.h" 10 #include "chrome/browser/ui/host_desktop.h"
(...skipping 16 matching lines...) Expand all
27 // Returns a list of accelerator mapping information for accelerators 27 // Returns a list of accelerator mapping information for accelerators
28 // handled by Chrome but excluding accelerators handled by Ash. 28 // handled by Chrome but excluding accelerators handled by Ash.
29 CHROME_VIEWS_EXPORT std::vector<AcceleratorMapping> GetAcceleratorList(); 29 CHROME_VIEWS_EXPORT std::vector<AcceleratorMapping> GetAcceleratorList();
30 30
31 // Returns true if the desktop host type indicates Ash and if the 31 // Returns true if the desktop host type indicates Ash and if the
32 // command id has an associated accelerator which is handled by 32 // command id has an associated accelerator which is handled by
33 // Ash. If the return is true the accelerator is returned via the 33 // Ash. If the return is true the accelerator is returned via the
34 // second argument. 34 // second argument.
35 CHROME_VIEWS_EXPORT bool GetAshAcceleratorForCommandId( 35 CHROME_VIEWS_EXPORT bool GetAshAcceleratorForCommandId(
36 int command_id, 36 int command_id,
37 HostDesktopType host_desktop_type, 37 ui::HostDesktopType host_desktop_type,
38 ui::Accelerator* accelerator); 38 ui::Accelerator* accelerator);
39 39
40 // Returns true if the command id has an associated standard 40 // Returns true if the command id has an associated standard
41 // accelerator like cut, copy and paste. If the return is true the 41 // accelerator like cut, copy and paste. If the return is true the
42 // accelerator is returned via the second argument. 42 // accelerator is returned via the second argument.
43 CHROME_VIEWS_EXPORT bool GetStandardAcceleratorForCommandId( 43 CHROME_VIEWS_EXPORT bool GetStandardAcceleratorForCommandId(
44 int command_id, 44 int command_id,
45 ui::Accelerator* accelerator); 45 ui::Accelerator* accelerator);
46 46
47 } // namespace chrome 47 } // namespace chrome
48 48
49 #endif // CHROME_BROWSER_UI_VIEWS_ACCELERATOR_TABLE_H_ 49 #endif // CHROME_BROWSER_UI_VIEWS_ACCELERATOR_TABLE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698