From 9552c2ddb6c18e9c12c3ffad8607e4478362c30c Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Mon, 6 Jan 2014 02:05:32 +0000 Subject: 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 --- ui/base/accelerators/accelerator.h | 6 +++--- ui/base/accelerators/accelerator_manager.h | 4 ++-- ui/base/accelerators/menu_label_accelerator_util_linux.h | 10 ++++++---- ui/base/accelerators/platform_accelerator.h | 4 ++-- ui/base/accelerators/platform_accelerator_cocoa.h | 2 +- ui/base/accelerators/platform_accelerator_gtk.h | 9 +++++---- 6 files changed, 19 insertions(+), 16 deletions(-) (limited to 'ui/base/accelerators') 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; diff --git a/ui/base/accelerators/accelerator_manager.h b/ui/base/accelerators/accelerator_manager.h index 818dc3e..0e33ad65 100644 --- a/ui/base/accelerators/accelerator_manager.h +++ b/ui/base/accelerators/accelerator_manager.h @@ -11,13 +11,13 @@ #include "base/basictypes.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/base/ui_export.h" +#include "ui/base/ui_base_export.h" #include "ui/events/event_constants.h" namespace ui { // The AcceleratorManger is used to handle keyboard accelerators. -class UI_EXPORT AcceleratorManager { +class UI_BASE_EXPORT AcceleratorManager { public: enum HandlerPriority { kNormalPriority, diff --git a/ui/base/accelerators/menu_label_accelerator_util_linux.h b/ui/base/accelerators/menu_label_accelerator_util_linux.h index 6cc9b5f..bd8d3cf 100644 --- a/ui/base/accelerators/menu_label_accelerator_util_linux.h +++ b/ui/base/accelerators/menu_label_accelerator_util_linux.h @@ -7,22 +7,24 @@ #include -#include "ui/base/ui_export.h" +#include "ui/base/ui_base_export.h" namespace ui { // Change windows accelerator style to GTK style. (GTK uses _ for // accelerators. Windows uses & with && as an escape for &.) -UI_EXPORT std::string ConvertAcceleratorsFromWindowsStyle( +UI_BASE_EXPORT std::string ConvertAcceleratorsFromWindowsStyle( const std::string& label); // Removes the "&" accelerators from a Windows label. -UI_EXPORT std::string RemoveWindowsStyleAccelerators(const std::string& label); +UI_BASE_EXPORT std::string RemoveWindowsStyleAccelerators( + const std::string& label); // Escapes "&" characters by doubling them so that later calling // ConvertAcceleratorsFromWindowsStyle() will return the original string (except // with "_" characters doubled, to escape them for GTK). -UI_EXPORT std::string EscapeWindowsStyleAccelerators(const std::string& label); +UI_BASE_EXPORT std::string EscapeWindowsStyleAccelerators( + const std::string& label); } // namespace ui diff --git a/ui/base/accelerators/platform_accelerator.h b/ui/base/accelerators/platform_accelerator.h index 1b46003..cca8021 100644 --- a/ui/base/accelerators/platform_accelerator.h +++ b/ui/base/accelerators/platform_accelerator.h @@ -6,12 +6,12 @@ #define UI_BASE_ACCELERATORS_PLATFORM_ACCELERATOR_H_ #include "base/memory/scoped_ptr.h" -#include "ui/base/ui_export.h" +#include "ui/base/ui_base_export.h" namespace ui { // Abstract base class for platform specific accelerator keys. -class UI_EXPORT PlatformAccelerator { +class UI_BASE_EXPORT PlatformAccelerator { public: virtual ~PlatformAccelerator() {} diff --git a/ui/base/accelerators/platform_accelerator_cocoa.h b/ui/base/accelerators/platform_accelerator_cocoa.h index 30941c7..926089a 100644 --- a/ui/base/accelerators/platform_accelerator_cocoa.h +++ b/ui/base/accelerators/platform_accelerator_cocoa.h @@ -13,7 +13,7 @@ namespace ui { // This is a Mac specific class for specifing accelerator keys. -class UI_EXPORT PlatformAcceleratorCocoa : public PlatformAccelerator { +class UI_BASE_EXPORT PlatformAcceleratorCocoa : public PlatformAccelerator { public: PlatformAcceleratorCocoa(); PlatformAcceleratorCocoa(NSString* key_code, NSUInteger modifier_mask); diff --git a/ui/base/accelerators/platform_accelerator_gtk.h b/ui/base/accelerators/platform_accelerator_gtk.h index 87900dd..59c8fa0 100644 --- a/ui/base/accelerators/platform_accelerator_gtk.h +++ b/ui/base/accelerators/platform_accelerator_gtk.h @@ -16,7 +16,7 @@ namespace ui { class Accelerator; // This is a GTK specific class for specifing accelerator keys. -class UI_EXPORT PlatformAcceleratorGtk : public PlatformAccelerator { +class UI_BASE_EXPORT PlatformAcceleratorGtk : public PlatformAccelerator { public: PlatformAcceleratorGtk(); PlatformAcceleratorGtk(guint gdk_key_code, GdkModifierType gdk_modifier); @@ -36,11 +36,12 @@ class UI_EXPORT PlatformAcceleratorGtk : public PlatformAccelerator { DISALLOW_COPY_AND_ASSIGN(PlatformAcceleratorGtk); }; -UI_EXPORT Accelerator AcceleratorForGdkKeyCodeAndModifier( +UI_BASE_EXPORT Accelerator AcceleratorForGdkKeyCodeAndModifier( guint gdk_key_code, GdkModifierType gdk_modifier); -UI_EXPORT guint GetGdkKeyCodeForAccelerator(const Accelerator& accelerator); -UI_EXPORT GdkModifierType GetGdkModifierForAccelerator( +UI_BASE_EXPORT guint + GetGdkKeyCodeForAccelerator(const Accelerator& accelerator); +UI_BASE_EXPORT GdkModifierType GetGdkModifierForAccelerator( const Accelerator& accelerator); } // namespace ui -- cgit v1.1