summaryrefslogtreecommitdiffstats
path: root/ui/base/accelerators/accelerator.h
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-06 02:05:32 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-06 02:05:32 +0000
commit9552c2ddb6c18e9c12c3ffad8607e4478362c30c (patch)
treeacb4dffda7bff91f611893fbbd1d2a821fb42bfa /ui/base/accelerators/accelerator.h
parentd9e37818e1d9267582ae13053534a547628e6f9e (diff)
downloadchromium_src-9552c2ddb6c18e9c12c3ffad8607e4478362c30c.zip
chromium_src-9552c2ddb6c18e9c12c3ffad8607e4478362c30c.tar.gz
chromium_src-9552c2ddb6c18e9c12c3ffad8607e4478362c30c.tar.bz2
ui: Rename ui_export.h to ui_base_export.h
Also renames UI_EXPORT to UI_BASE_EXPORT. BUG=299841 TEST=None, no functional changes TBR=ben@chromium.org Review URL: https://codereview.chromium.org/93863005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/accelerators/accelerator.h')
-rw-r--r--ui/base/accelerators/accelerator.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/base/accelerators/accelerator.h b/ui/base/accelerators/accelerator.h
index 020c7be..15ca6cc 100644
--- a/ui/base/accelerators/accelerator.h
+++ b/ui/base/accelerators/accelerator.h
@@ -14,7 +14,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
#include "ui/base/accelerators/platform_accelerator.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
#include "ui/events/event_constants.h"
#include "ui/events/keycodes/keyboard_codes.h"
@@ -24,7 +24,7 @@ class PlatformAccelerator;
// This is a cross-platform class for accelerator keys used in menus.
// |platform_accelerator| should be used to store platform specific data.
-class UI_EXPORT Accelerator {
+class UI_BASE_EXPORT Accelerator {
public:
Accelerator();
Accelerator(ui::KeyboardCode keycode, int modifiers);
@@ -84,7 +84,7 @@ class UI_EXPORT Accelerator {
// An interface that classes that want to register for keyboard accelerators
// should implement.
-class UI_EXPORT AcceleratorTarget {
+class UI_BASE_EXPORT AcceleratorTarget {
public:
// Should return true if the accelerator was processed.
virtual bool AcceleratorPressed(const Accelerator& accelerator) = 0;