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

153 files changed, 776 insertions, 751 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;
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 <string>
 
-#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
diff --git a/ui/base/accessibility/accessible_text_utils.h b/ui/base/accessibility/accessible_text_utils.h
index a64088c..5f24f82 100644
--- a/ui/base/accessibility/accessible_text_utils.h
+++ b/ui/base/accessibility/accessible_text_utils.h
@@ -9,7 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
@@ -42,11 +42,12 @@ enum TextBoundaryDirection {
 // (depending on |direction|) from the given |start_offset| until the
 // given boundary is found, and return the offset of that boundary,
 // using the vector of line break character offsets in |line_breaks|.
-size_t UI_EXPORT FindAccessibleTextBoundary(const base::string16& text,
-                                            const std::vector<int>& line_breaks,
-                                            TextBoundaryType boundary,
-                                            size_t start_offset,
-                                            TextBoundaryDirection direction);
+size_t UI_BASE_EXPORT
+    FindAccessibleTextBoundary(const base::string16& text,
+                               const std::vector<int>& line_breaks,
+                               TextBoundaryType boundary,
+                               size_t start_offset,
+                               TextBoundaryDirection direction);
 
 }  // namespace ui
 
diff --git a/ui/base/accessibility/accessible_view_state.h b/ui/base/accessibility/accessible_view_state.h
index 2f4b4bf..cfe38c0 100644
--- a/ui/base/accessibility/accessible_view_state.h
+++ b/ui/base/accessibility/accessible_view_state.h
@@ -9,7 +9,7 @@
 #include "base/callback.h"
 #include "base/strings/string16.h"
 #include "ui/base/accessibility/accessibility_types.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
@@ -21,7 +21,7 @@ namespace ui {
 //   that should be provided about any UI view to assistive technology (AT).
 //
 ////////////////////////////////////////////////////////////////////////////////
-struct UI_EXPORT AccessibleViewState {
+struct UI_BASE_EXPORT AccessibleViewState {
  public:
   AccessibleViewState();
   ~AccessibleViewState();
diff --git a/ui/base/android/ui_base_jni_registrar.h b/ui/base/android/ui_base_jni_registrar.h
index 928e515..7540d91 100644
--- a/ui/base/android/ui_base_jni_registrar.h
+++ b/ui/base/android/ui_base_jni_registrar.h
@@ -7,13 +7,13 @@
 
 #include <jni.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 namespace android {
 
 // Register all JNI bindings necessary for chrome.
-UI_EXPORT bool RegisterJni(JNIEnv* env);
+UI_BASE_EXPORT bool RegisterJni(JNIEnv* env);
 
 }  // namespace android
 }  // namespace ui
diff --git a/ui/base/android/view_android.h b/ui/base/android/view_android.h
index 7bd334d..fbaabc7 100644
--- a/ui/base/android/view_android.h
+++ b/ui/base/android/view_android.h
@@ -8,7 +8,7 @@
 #include <jni.h>
 #include "base/android/jni_helper.h"
 #include "base/android/scoped_java_ref.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
@@ -16,7 +16,7 @@ class WindowAndroid;
 
 // This class is the native counterpart for ViewAndroid. It is owned by the
 // Java ViewAndroid object.
-class UI_EXPORT ViewAndroid {
+class UI_BASE_EXPORT ViewAndroid {
  public:
   ViewAndroid(JNIEnv* env, jobject obj, WindowAndroid* window);
 
diff --git a/ui/base/android/window_android.h b/ui/base/android/window_android.h
index 1da7073..5e6532e 100644
--- a/ui/base/android/window_android.h
+++ b/ui/base/android/window_android.h
@@ -10,7 +10,7 @@
 #include "base/android/jni_helper.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/observer_list.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/vector2d_f.h"
 
 namespace ui {
@@ -18,7 +18,7 @@ namespace ui {
 class WindowAndroidObserver;
 
 // Android implementation of the activity window.
-class UI_EXPORT WindowAndroid {
+class UI_BASE_EXPORT WindowAndroid {
  public:
   WindowAndroid(JNIEnv* env, jobject obj);
 
diff --git a/ui/base/android/window_android_observer.h b/ui/base/android/window_android_observer.h
index 790170e..e1c6f62 100644
--- a/ui/base/android/window_android_observer.h
+++ b/ui/base/android/window_android_observer.h
@@ -5,11 +5,11 @@
 #ifndef UI_BASE_ANDROID_WINDOW_ANDROID_OBSERVER_H_
 #define UI_BASE_ANDROID_WINDOW_ANDROID_OBSERVER_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
-class UI_EXPORT WindowAndroidObserver {
+class UI_BASE_EXPORT WindowAndroidObserver {
  public:
   virtual void OnCompositingDidCommit() = 0;
   virtual void OnAttachCompositor() = 0;
diff --git a/ui/base/base_window.h b/ui/base/base_window.h
index 73c2689..6646169 100644
--- a/ui/base/base_window.h
+++ b/ui/base/base_window.h
@@ -19,7 +19,7 @@ namespace ui {
 
 // Provides an interface to perform actions on windows, and query window
 // state.
-class UI_EXPORT BaseWindow {
+class UI_BASE_EXPORT BaseWindow {
  public:
   // Returns true if the window is currently the active/focused window.
   virtual bool IsActive() const = 0;
diff --git a/ui/base/clipboard/clipboard.h b/ui/base/clipboard/clipboard.h
index f41ac7a..8b6e2ce 100644
--- a/ui/base/clipboard/clipboard.h
+++ b/ui/base/clipboard/clipboard.h
@@ -18,7 +18,7 @@
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread_checker.h"
 #include "ui/base/clipboard/clipboard_types.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gdk/gdk.h>
@@ -64,7 +64,7 @@ class NSString;
 namespace ui {
 class ClipboardTest;
 
-class UI_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) {
+class UI_BASE_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) {
  public:
   // MIME type constants.
   static const char kMimeTypeText[];
@@ -75,7 +75,7 @@ class UI_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) {
   static const char kMimeTypePNG[];
 
   // Platform neutral holder for native data representation of a clipboard type.
-  struct UI_EXPORT FormatType {
+  struct UI_BASE_EXPORT FormatType {
     FormatType();
     ~FormatType();
 
diff --git a/ui/base/clipboard/clipboard_util_win.h b/ui/base/clipboard/clipboard_util_win.h
index 523897b..621fc469 100644
--- a/ui/base/clipboard/clipboard_util_win.h
+++ b/ui/base/clipboard/clipboard_util_win.h
@@ -13,11 +13,11 @@
 #include <vector>
 
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
-class UI_EXPORT ClipboardUtil {
+class UI_BASE_EXPORT ClipboardUtil {
  public:
   /////////////////////////////////////////////////////////////////////////////
   // These methods check to see if |data_object| has the requested type.
diff --git a/ui/base/clipboard/custom_data_helper.h b/ui/base/clipboard/custom_data_helper.h
index 55e7dce..9ca7065 100644
--- a/ui/base/clipboard/custom_data_helper.h
+++ b/ui/base/clipboard/custom_data_helper.h
@@ -14,7 +14,7 @@
 #include <vector>
 
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 class Pickle;
 
@@ -29,24 +29,24 @@ class NSString;
 namespace ui {
 
 #if defined(OS_MACOSX)
-UI_EXPORT extern NSString* const kWebCustomDataPboardType;
+UI_BASE_EXPORT extern NSString* const kWebCustomDataPboardType;
 #elif (!defined(OS_WIN) && defined(USE_AURA)) || defined(TOOLKIT_GTK)
-UI_EXPORT extern const char kMimeTypeWebCustomData[];
+UI_BASE_EXPORT extern const char kMimeTypeWebCustomData[];
 #endif
 
-UI_EXPORT void ReadCustomDataTypes(const void* data,
-                                   size_t data_length,
-                                   std::vector<base::string16>* types);
-UI_EXPORT void ReadCustomDataForType(const void* data,
-                                     size_t data_length,
-                                     const base::string16& type,
-                                     base::string16* result);
-UI_EXPORT void ReadCustomDataIntoMap(
+UI_BASE_EXPORT void ReadCustomDataTypes(const void* data,
+                                        size_t data_length,
+                                        std::vector<base::string16>* types);
+UI_BASE_EXPORT void ReadCustomDataForType(const void* data,
+                                          size_t data_length,
+                                          const base::string16& type,
+                                          base::string16* result);
+UI_BASE_EXPORT void ReadCustomDataIntoMap(
     const void* data,
     size_t data_length,
     std::map<base::string16, base::string16>* result);
 
-UI_EXPORT void WriteCustomDataToPickle(
+UI_BASE_EXPORT void WriteCustomDataToPickle(
     const std::map<base::string16, base::string16>& data,
     Pickle* pickle);
 
diff --git a/ui/base/clipboard/scoped_clipboard_writer.h b/ui/base/clipboard/scoped_clipboard_writer.h
index 8c7bb1a..504d2e3 100644
--- a/ui/base/clipboard/scoped_clipboard_writer.h
+++ b/ui/base/clipboard/scoped_clipboard_writer.h
@@ -15,7 +15,7 @@
 
 #include "base/strings/string16.h"
 #include "ui/base/clipboard/clipboard.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 class Pickle;
 
@@ -25,7 +25,7 @@ namespace ui {
 // into a Clipboard::ObjectMap.
 // NB: You should probably NOT be using this class if you include
 // webkit_glue.h. Use ScopedClipboardWriterGlue instead.
-class UI_EXPORT ScopedClipboardWriter {
+class UI_BASE_EXPORT ScopedClipboardWriter {
  public:
   // Create an instance that is a simple wrapper around clipboard.
   ScopedClipboardWriter(Clipboard* clipboard, ClipboardType type);
diff --git a/ui/base/cocoa/appkit_utils.h b/ui/base/cocoa/appkit_utils.h
index 159921b..eca3a7e 100644
--- a/ui/base/cocoa/appkit_utils.h
+++ b/ui/base/cocoa/appkit_utils.h
@@ -7,7 +7,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
@@ -24,11 +24,11 @@ struct NinePartImageIds {
 };
 
 // Utility method to draw a nine part image using image ids.
-UI_EXPORT void DrawNinePartImage(NSRect frame,
-                                 const NinePartImageIds& image_ids,
-                                 NSCompositingOperation operation,
-                                 CGFloat alpha,
-                                 BOOL flipped);
+UI_BASE_EXPORT void DrawNinePartImage(NSRect frame,
+                                      const NinePartImageIds& image_ids,
+                                      NSCompositingOperation operation,
+                                      CGFloat alpha,
+                                      BOOL flipped);
 
 }  // namespace ui
 
diff --git a/ui/base/cocoa/base_view.h b/ui/base/cocoa/base_view.h
index 60f0c39..ac7bba4 100644
--- a/ui/base/cocoa/base_view.h
+++ b/ui/base/cocoa/base_view.h
@@ -9,14 +9,14 @@
 
 #include "base/mac/scoped_nsobject.h"
 #import "ui/base/cocoa/tracking_area.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/rect.h"
 
 // A view that provides common functionality that many views will need:
 // - Automatic registration for mouse-moved events.
 // - Funneling of mouse and key events to two methods
 // - Coordinate conversion utilities
-UI_EXPORT
+UI_BASE_EXPORT
 @interface BaseView : NSView {
  @public
   enum EventHandled {
@@ -47,7 +47,7 @@ UI_EXPORT
 // The name is |kViewDidBecomeFirstResponder|, the object is the view, and the
 // NSSelectionDirection is wrapped in an NSNumber under the key
 // |kSelectionDirection|.
-UI_EXPORT extern NSString* kViewDidBecomeFirstResponder;
-UI_EXPORT extern NSString* kSelectionDirection;
+UI_BASE_EXPORT extern NSString* kViewDidBecomeFirstResponder;
+UI_BASE_EXPORT extern NSString* kSelectionDirection;
 
 #endif  // UI_BASE_COCOA_BASE_VIEW_H_
diff --git a/ui/base/cocoa/cocoa_event_utils.h b/ui/base/cocoa/cocoa_event_utils.h
index 1432f2d..fda1448 100644
--- a/ui/base/cocoa/cocoa_event_utils.h
+++ b/ui/base/cocoa/cocoa_event_utils.h
@@ -7,35 +7,35 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/base/window_open_disposition.h"
 
 namespace ui {
 
 // Retrieves a bitsum of ui::EventFlags represented by |event|,
-UI_EXPORT int EventFlagsFromNSEvent(NSEvent* event);
+UI_BASE_EXPORT int EventFlagsFromNSEvent(NSEvent* event);
 
 // Retrieves a bitsum of ui::EventFlags represented by |event|,
 // but instead use the modifier flags given by |modifiers|,
 // which is the same format as |-NSEvent modifierFlags|. This allows
 // substitution of the modifiers without having to create a new event from
 // scratch.
-UI_EXPORT int EventFlagsFromNSEventWithModifiers(NSEvent* event,
-                                                 NSUInteger modifiers);
+UI_BASE_EXPORT int EventFlagsFromNSEventWithModifiers(NSEvent* event,
+                                                      NSUInteger modifiers);
 
 // Retrieves the WindowOpenDisposition used to open a link from a user gesture
 // represented by |event|. For example, a Cmd+Click would mean open the
 // associated link in a background tab.
-UI_EXPORT WindowOpenDisposition WindowOpenDispositionFromNSEvent(
-    NSEvent* event);
+UI_BASE_EXPORT WindowOpenDisposition
+    WindowOpenDispositionFromNSEvent(NSEvent* event);
 
 // Retrieves the WindowOpenDisposition used to open a link from a user gesture
 // represented by |event|, but instead use the modifier flags given by |flags|,
 // which is the same format as |-NSEvent modifierFlags|. This allows
 // substitution of the modifiers without having to create a new event from
 // scratch.
-UI_EXPORT WindowOpenDisposition WindowOpenDispositionFromNSEventWithFlags(
-    NSEvent* event, NSUInteger flags);
+UI_BASE_EXPORT WindowOpenDisposition
+    WindowOpenDispositionFromNSEventWithFlags(NSEvent* event, NSUInteger flags);
 
 }  // namespace ui
 
diff --git a/ui/base/cocoa/controls/blue_label_button.h b/ui/base/cocoa/controls/blue_label_button.h
index a8d66db..d6d38ec 100644
--- a/ui/base/cocoa/controls/blue_label_button.h
+++ b/ui/base/cocoa/controls/blue_label_button.h
@@ -8,12 +8,12 @@
 #import <Cocoa/Cocoa.h>
 
 #import "ui/base/cocoa/hover_button.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 // A rectangular blue NSButton that reacts to hover, focus and lit states. It
 // can contain an arbitrary single-line text label, and will be sized to fit the
 // font height and label width.
-UI_EXPORT
+UI_BASE_EXPORT
 @interface BlueLabelButton : HoverButton
 @end
 
diff --git a/ui/base/cocoa/controls/hover_image_menu_button.h b/ui/base/cocoa/controls/hover_image_menu_button.h
index f6af7bf..86914192 100644
--- a/ui/base/cocoa/controls/hover_image_menu_button.h
+++ b/ui/base/cocoa/controls/hover_image_menu_button.h
@@ -8,7 +8,7 @@
 #import <Cocoa/Cocoa.h>
 
 #import "ui/base/cocoa/tracking_area.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 @class HoverImageMenuButtonCell;
 
@@ -16,7 +16,7 @@
 // [[self cell] setHovered:flag] when the hover state changes. Uses
 // HoverImageMenuButtonCell as the default cellClass. Note that the menu item at
 // index 0 is ignored and client code should populate it with a dummy item.
-UI_EXPORT
+UI_BASE_EXPORT
 @interface HoverImageMenuButton : NSPopUpButton {
  @private
   ui::ScopedCrTrackingArea trackingArea_;
diff --git a/ui/base/cocoa/controls/hover_image_menu_button_cell.h b/ui/base/cocoa/controls/hover_image_menu_button_cell.h
index fad48fe..249a74d 100644
--- a/ui/base/cocoa/controls/hover_image_menu_button_cell.h
+++ b/ui/base/cocoa/controls/hover_image_menu_button_cell.h
@@ -8,13 +8,13 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsobject.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 // A custom NSPopUpButtonCell that permits a hover image, and draws only an
 // image in its frame; no border, bezel or drop-down arrow. Use setDefaultImage:
 // to set the default image, setAlternateImage: to set the button shown while
 // the menu is active, and setHoverImage: for the mouseover hover image.
-UI_EXPORT
+UI_BASE_EXPORT
 @interface HoverImageMenuButtonCell : NSPopUpButtonCell {
  @private
   base::scoped_nsobject<NSImage> hoverImage_;
diff --git a/ui/base/cocoa/controls/hyperlink_button_cell.h b/ui/base/cocoa/controls/hyperlink_button_cell.h
index 944f0ed..6e3b74d 100644
--- a/ui/base/cocoa/controls/hyperlink_button_cell.h
+++ b/ui/base/cocoa/controls/hyperlink_button_cell.h
@@ -8,7 +8,7 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsobject.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 // A HyperlinkButtonCell is used to create an NSButton that looks and acts
 // like a hyperlink. The default styling is to look like blue, underlined text
@@ -23,7 +23,7 @@
 //
 // Use this if all of your text is a link. If you need text that contains
 // embedded links but also regular text, use HyperlinkTextView.
-UI_EXPORT
+UI_BASE_EXPORT
 @interface HyperlinkButtonCell : NSButtonCell {
   base::scoped_nsobject<NSColor> textColor_;
   BOOL shouldUnderline_;
diff --git a/ui/base/cocoa/find_pasteboard.h b/ui/base/cocoa/find_pasteboard.h
index 0595ffe..863b398 100644
--- a/ui/base/cocoa/find_pasteboard.h
+++ b/ui/base/cocoa/find_pasteboard.h
@@ -12,9 +12,9 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsobject.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
-UI_EXPORT extern NSString* kFindPasteboardChangedNotification;
+UI_BASE_EXPORT extern NSString* kFindPasteboardChangedNotification;
 
 // Manages the find pasteboard. Use this to copy text to the find pasteboard,
 // to get the text currently on the find pasteboard, and to receive
@@ -25,7 +25,7 @@ UI_EXPORT extern NSString* kFindPasteboardChangedNotification;
 // This is not thread-safe and must be used on the main thread.
 //
 // This is supposed to be a singleton.
-UI_EXPORT
+UI_BASE_EXPORT
 @interface FindPasteboard : NSObject {
  @private
   base::scoped_nsobject<NSString> findText_;
@@ -54,6 +54,6 @@ UI_EXPORT
 #endif  // __OBJC__
 
 // Also provide a c++ interface
-UI_EXPORT base::string16 GetFindPboardText();
+UI_BASE_EXPORT base::string16 GetFindPboardText();
 
 #endif  // UI_BASE_COCOA_FIND_PASTEBOARD_H_
diff --git a/ui/base/cocoa/flipped_view.h b/ui/base/cocoa/flipped_view.h
index c05f38c..7bc1177 100644
--- a/ui/base/cocoa/flipped_view.h
+++ b/ui/base/cocoa/flipped_view.h
@@ -7,13 +7,13 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 // A view where the Y axis is flipped such that the origin is at the top left
 // and Y value increases downwards. Drawing is flipped so that layout of the
 // sections is easier. Apple recommends flipping the coordinate origin when
 // doing a lot of text layout because it's more natural.
-UI_EXPORT
+UI_BASE_EXPORT
 @interface FlippedView : NSView
 @end
 
diff --git a/ui/base/cocoa/focus_tracker.h b/ui/base/cocoa/focus_tracker.h
index 6a0c3ba..301a48f 100644
--- a/ui/base/cocoa/focus_tracker.h
+++ b/ui/base/cocoa/focus_tracker.h
@@ -5,14 +5,14 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsobject.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 // A class that handles saving and restoring focus.  An instance of
 // this class snapshots the currently focused view when it is
 // constructed, and callers can use restoreFocus to return focus to
 // that view.  FocusTracker will not restore focus to views that are
 // no longer in the view hierarchy or are not in the correct window.
-UI_EXPORT
+UI_BASE_EXPORT
 @interface FocusTracker : NSObject {
  @private
   base::scoped_nsobject<NSView> focusedView_;
diff --git a/ui/base/cocoa/focus_window_set.h b/ui/base/cocoa/focus_window_set.h
index d43ff2a..c4212b5 100644
--- a/ui/base/cocoa/focus_window_set.h
+++ b/ui/base/cocoa/focus_window_set.h
@@ -7,7 +7,7 @@
 
 #include <set>
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace ui {
@@ -15,8 +15,8 @@ namespace ui {
 // Brings a group of windows to the front without changing their order, and
 // makes the frontmost one key and main. If none are visible, the frontmost
 // miniaturized window is deminiaturized.
-UI_EXPORT void FocusWindowSet(const std::set<gfx::NativeWindow>& windows,
-                              bool allow_workspace_switch);
+UI_BASE_EXPORT void FocusWindowSet(const std::set<gfx::NativeWindow>& windows,
+                                   bool allow_workspace_switch);
 
 }  // namespace ui
 
diff --git a/ui/base/cocoa/fullscreen_window_manager.h b/ui/base/cocoa/fullscreen_window_manager.h
index 1b18912..be59cad 100644
--- a/ui/base/cocoa/fullscreen_window_manager.h
+++ b/ui/base/cocoa/fullscreen_window_manager.h
@@ -9,11 +9,11 @@
 
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsobject.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 // A utility class to manage the fullscreen mode for a given window. This class
 // also updates the window frame if the screen changes.
-UI_EXPORT
+UI_BASE_EXPORT
 @interface FullscreenWindowManager : NSObject {
  @private
   base::scoped_nsobject<NSWindow> window_;
diff --git a/ui/base/cocoa/hover_button.h b/ui/base/cocoa/hover_button.h
index 4040c2c..7a0e156 100644
--- a/ui/base/cocoa/hover_button.h
+++ b/ui/base/cocoa/hover_button.h
@@ -8,10 +8,10 @@
 #import <Cocoa/Cocoa.h>
 
 #import "ui/base/cocoa/tracking_area.h"
-#import "ui/base/ui_export.h"
+#import "ui/base/ui_base_export.h"
 
 // A button that changes when you hover over it and click it.
-UI_EXPORT
+UI_BASE_EXPORT
 @interface HoverButton : NSButton {
  @protected
   // Enumeration of the hover states that the close button can be in at any one
diff --git a/ui/base/cocoa/hover_image_button.h b/ui/base/cocoa/hover_image_button.h
index d43a7fa..a00163f 100644
--- a/ui/base/cocoa/hover_image_button.h
+++ b/ui/base/cocoa/hover_image_button.h
@@ -9,10 +9,10 @@
 
 #import "base/mac/scoped_nsobject.h"
 #import "ui/base/cocoa/hover_button.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 // A button that changes images when you hover over it and click it.
-UI_EXPORT
+UI_BASE_EXPORT
 @interface HoverImageButton : HoverButton {
  @private
   base::scoped_nsobject<NSImage> defaultImage_;
diff --git a/ui/base/cocoa/menu_controller.h b/ui/base/cocoa/menu_controller.h
index b8d8ed0..1da6674 100644
--- a/ui/base/cocoa/menu_controller.h
+++ b/ui/base/cocoa/menu_controller.h
@@ -9,7 +9,7 @@
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 class MenuModel;
@@ -21,7 +21,7 @@ class MenuModel;
 // allow for hierarchical menus). The tag is the index into that model for
 // that particular item. It is important that the model outlives this object
 // as it only maintains weak references.
-UI_EXPORT
+UI_BASE_EXPORT
 @interface MenuController : NSObject<NSMenuDelegate> {
  @protected
   ui::MenuModel* model_;  // weak
diff --git a/ui/base/cocoa/nib_loading.h b/ui/base/cocoa/nib_loading.h
index ab8e23f..263ac48 100644
--- a/ui/base/cocoa/nib_loading.h
+++ b/ui/base/cocoa/nib_loading.h
@@ -7,13 +7,13 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
 // Given the name of a nib file, gets an unowned reference to the NSView in the
 // nib. Requires a nib with just a single root view.
-UI_EXPORT NSView* GetViewFromNib(NSString* name);
+UI_BASE_EXPORT NSView* GetViewFromNib(NSString* name);
 
 }  // namespace ui
 
diff --git a/ui/base/cocoa/tracking_area.h b/ui/base/cocoa/tracking_area.h
index 782cdae..df37686 100644
--- a/ui/base/cocoa/tracking_area.h
+++ b/ui/base/cocoa/tracking_area.h
@@ -8,13 +8,13 @@
 #import <AppKit/AppKit.h>
 
 #include "base/mac/scoped_nsobject.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 @class CrTrackingAreaOwnerProxy;
 
 // The CrTrackingArea can be used in place of an NSTrackingArea to shut off
 // messaging to the |owner| at a specific point in time.
-UI_EXPORT
+UI_BASE_EXPORT
 @interface CrTrackingArea : NSTrackingArea {
  @private
   base::scoped_nsobject<CrTrackingAreaOwnerProxy> ownerProxy_;
@@ -42,7 +42,7 @@ namespace ui {
 
 // Use an instance of this class to call |-clearOwner| on the |tracking_area_|
 // when this goes out of scope.
-class UI_EXPORT ScopedCrTrackingArea {
+class UI_BASE_EXPORT ScopedCrTrackingArea {
  public:
   // Takes ownership of |tracking_area| without retaining it.
   explicit ScopedCrTrackingArea(CrTrackingArea* tracking_area = nil);
diff --git a/ui/base/cocoa/underlay_opengl_hosting_window.h b/ui/base/cocoa/underlay_opengl_hosting_window.h
index fb9eba4..25c81fd 100644
--- a/ui/base/cocoa/underlay_opengl_hosting_window.h
+++ b/ui/base/cocoa/underlay_opengl_hosting_window.h
@@ -7,12 +7,12 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 // Common base class for windows that host a OpenGL surface that renders under
 // the window. Contains methods relating to hole punching so that the OpenGL
 // surface is visible through the window.
-UI_EXPORT
+UI_BASE_EXPORT
 @interface UnderlayOpenGLHostingWindow : NSWindow
 @end
 
diff --git a/ui/base/cocoa/window_size_constants.h b/ui/base/cocoa/window_size_constants.h
index 11cf318..bb94018 100644
--- a/ui/base/cocoa/window_size_constants.h
+++ b/ui/base/cocoa/window_size_constants.h
@@ -5,14 +5,14 @@
 #ifndef UI_BASE_COCOA_WINDOW_SIZE_CONSTANTS_H_
 #define UI_BASE_COCOA_WINDOW_SIZE_CONSTANTS_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 #import <Foundation/Foundation.h>
 
 namespace ui {
 
 // It is not valid to make a zero-sized window. Use this constant instead.
-UI_EXPORT extern const NSRect kWindowSizeDeterminedLater;
+UI_BASE_EXPORT extern const NSRect kWindowSizeDeterminedLater;
 
 }  // namespace ui
 
diff --git a/ui/base/cursor/cursor.h b/ui/base/cursor/cursor.h
index bb832fa..72999d4 100644
--- a/ui/base/cursor/cursor.h
+++ b/ui/base/cursor/cursor.h
@@ -6,7 +6,7 @@
 #define UI_BASE_CURSOR_CURSOR_H_
 
 #include "build/build_config.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace gfx {
 class Point;
@@ -88,7 +88,7 @@ enum CursorSetType {
 };
 
 // Ref-counted cursor that supports both default and custom cursors.
-class UI_EXPORT Cursor {
+class UI_BASE_EXPORT Cursor {
  public:
   Cursor();
 
diff --git a/ui/base/cursor/cursor_loader.h b/ui/base/cursor/cursor_loader.h
index d54d298..8526e29 100644
--- a/ui/base/cursor/cursor_loader.h
+++ b/ui/base/cursor/cursor_loader.h
@@ -7,14 +7,14 @@
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
 
 namespace ui {
 
-class UI_EXPORT CursorLoader {
+class UI_BASE_EXPORT CursorLoader {
  public:
   CursorLoader() : scale_(1.f) {}
   virtual ~CursorLoader() {}
diff --git a/ui/base/cursor/cursor_loader_null.h b/ui/base/cursor/cursor_loader_null.h
index 2750306..5cb9ced 100644
--- a/ui/base/cursor/cursor_loader_null.h
+++ b/ui/base/cursor/cursor_loader_null.h
@@ -7,11 +7,11 @@
 
 #include "base/compiler_specific.h"
 #include "ui/base/cursor/cursor_loader.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
-class UI_EXPORT CursorLoaderNull : public CursorLoader {
+class UI_BASE_EXPORT CursorLoaderNull : public CursorLoader {
  public:
   CursorLoaderNull();
   virtual ~CursorLoaderNull();
diff --git a/ui/base/cursor/cursor_loader_win.h b/ui/base/cursor/cursor_loader_win.h
index 02e5e40..620dd5d 100644
--- a/ui/base/cursor/cursor_loader_win.h
+++ b/ui/base/cursor/cursor_loader_win.h
@@ -10,7 +10,7 @@
 
 namespace ui {
 
-class UI_EXPORT CursorLoaderWin : public CursorLoader {
+class UI_BASE_EXPORT CursorLoaderWin : public CursorLoader {
  public:
   CursorLoaderWin();
   virtual ~CursorLoaderWin();
diff --git a/ui/base/cursor/cursor_loader_x11.h b/ui/base/cursor/cursor_loader_x11.h
index a0265ff..d493b1e 100644
--- a/ui/base/cursor/cursor_loader_x11.h
+++ b/ui/base/cursor/cursor_loader_x11.h
@@ -11,13 +11,13 @@
 #include "base/compiler_specific.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/cursor/cursor_loader.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/display.h"
 
 namespace ui {
 
-class UI_EXPORT CursorLoaderX11 : public CursorLoader {
+class UI_BASE_EXPORT CursorLoaderX11 : public CursorLoader {
  public:
   CursorLoaderX11();
   virtual ~CursorLoaderX11();
@@ -59,7 +59,7 @@ class UI_EXPORT CursorLoaderX11 : public CursorLoader {
 // Scale and rotate the cursor's bitmap and hotpoint.
 // |bitmap_in_out| and |hotpoint_in_out| are used as
 // both input and output.
-UI_EXPORT void ScaleAndRotateCursorBitmapAndHotpoint(
+UI_BASE_EXPORT void ScaleAndRotateCursorBitmapAndHotpoint(
     float scale,
     gfx::Display::Rotation rotation,
     SkBitmap* bitmap_in_out,
diff --git a/ui/base/cursor/cursors_aura.h b/ui/base/cursor/cursors_aura.h
index 7d098a1..e8eae0a 100644
--- a/ui/base/cursor/cursors_aura.h
+++ b/ui/base/cursor/cursors_aura.h
@@ -6,7 +6,7 @@
 #define UI_BASE_CURSOR_CURSORS_AURA_H_
 
 #include "ui/base/cursor/cursor.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 class SkBitmap;
 
@@ -22,24 +22,23 @@ const int kAnimatedCursorFrameDelayMs = 25;
 // ui::kCursorHelp. The IDR will be placed in |resource_id| and the hotspots
 // for the different DPIs will be placed in |hot_1x| and |hot_2x|. Returns
 // false if |id| is invalid.
-bool UI_EXPORT GetCursorDataFor(CursorSetType cursor_set_id,
-                                int id,
-                                float scale_factor,
-                                int* resource_id,
-                                gfx::Point* point);
+bool UI_BASE_EXPORT GetCursorDataFor(CursorSetType cursor_set_id,
+                                     int id,
+                                     float scale_factor,
+                                     int* resource_id,
+                                     gfx::Point* point);
 
 // Like above, but for animated cursors.
-bool UI_EXPORT GetAnimatedCursorDataFor(CursorSetType cursor_set_id,
-                                        int id,
-                                        float scale_factor,
-                                        int* resource_id,
-                                        gfx::Point* point);
+bool UI_BASE_EXPORT GetAnimatedCursorDataFor(CursorSetType cursor_set_id,
+                                             int id,
+                                             float scale_factor,
+                                             int* resource_id,
+                                             gfx::Point* point);
 
 // Returns the cursor bitmap for |cursor|. Returns false if |cursor| is invalid.
 // The cursor hot point location is set in |point|.
-bool UI_EXPORT GetCursorBitmap(const Cursor& cursor,
-                               SkBitmap* bitmap,
-                               gfx::Point* point);
+bool UI_BASE_EXPORT
+    GetCursorBitmap(const Cursor& cursor, SkBitmap* bitmap, gfx::Point* point);
 
 }  // namespace ui
 
diff --git a/ui/base/default_theme_provider.h b/ui/base/default_theme_provider.h
index 15fa4a9..7f10205 100644
--- a/ui/base/default_theme_provider.h
+++ b/ui/base/default_theme_provider.h
@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/base/theme_provider.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 class ResourceBundle;
@@ -18,7 +18,7 @@ class ResourceBundle;
 
 namespace ui {
 
-class UI_EXPORT DefaultThemeProvider : public ThemeProvider {
+class UI_BASE_EXPORT DefaultThemeProvider : public ThemeProvider {
  public:
   DefaultThemeProvider();
   virtual ~DefaultThemeProvider();
diff --git a/ui/base/device_form_factor.h b/ui/base/device_form_factor.h
index 4b5cd57..f87ceca 100644
--- a/ui/base/device_form_factor.h
+++ b/ui/base/device_form_factor.h
@@ -5,7 +5,7 @@
 #ifndef UI_BASE_DEVICE_FORM_FACTOR_H_
 #define UI_BASE_DEVICE_FORM_FACTOR_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
@@ -17,7 +17,7 @@ enum DeviceFormFactor {
 
 // Returns the form factor of current device. For platforms other than Android
 // and iOS, DEVICE_FORM_FACTOR_DESKTOP is always returned.
-UI_EXPORT DeviceFormFactor GetDeviceFormFactor();
+UI_BASE_EXPORT DeviceFormFactor GetDeviceFormFactor();
 
 }  // namespace ui
 
diff --git a/ui/base/dragdrop/cocoa_dnd_util.h b/ui/base/dragdrop/cocoa_dnd_util.h
index 5b41014..1945c17 100644
--- a/ui/base/dragdrop/cocoa_dnd_util.h
+++ b/ui/base/dragdrop/cocoa_dnd_util.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 class GURL;
 
@@ -20,24 +20,24 @@ namespace ui {
 // any data associated with this type; it's only used to ensure that Chrome
 // supports any drag initiated inside of Chrome, whether or not data has been
 // associated with it.
-UI_EXPORT extern NSString* const kChromeDragDummyPboardType;
+UI_BASE_EXPORT extern NSString* const kChromeDragDummyPboardType;
 
 // Mail.app and TextEdit accept drags that have both HTML and image flavors on
 // them, but don't process them correctly <http://crbug.com/55879>. Therefore,
 // if there is an image flavor, don't put the HTML data on as HTML, but rather
 // put it on as this Chrome-only flavor. External apps won't see HTML but
 // Chrome will know enough to read it as HTML. <http://crbug.com/55879>
-UI_EXPORT extern NSString* const kChromeDragImageHTMLPboardType;
+UI_BASE_EXPORT extern NSString* const kChromeDragImageHTMLPboardType;
 
 // Populates the |url| and |title| with URL data in |pboard|. There may be more
 // than one, but we only handle dropping the first. |url| must not be |NULL|;
 // |title| is an optional parameter. Returns |YES| if URL data was obtained from
 // the pasteboard, |NO| otherwise. If |convert_filenames| is |YES|, the function
 // will also attempt to convert filenames in |pboard| to file URLs.
-UI_EXPORT BOOL PopulateURLAndTitleFromPasteboard(GURL* url,
-                                                 base::string16* title,
-                                                 NSPasteboard* pboard,
-                                                 BOOL convert_filenames);
+UI_BASE_EXPORT BOOL PopulateURLAndTitleFromPasteboard(GURL* url,
+                                                      base::string16* title,
+                                                      NSPasteboard* pboard,
+                                                      BOOL convert_filenames);
 
 }  // namespace ui
 
diff --git a/ui/base/dragdrop/download_file_interface.h b/ui/base/dragdrop/download_file_interface.h
index c157950..327fe79 100644
--- a/ui/base/dragdrop/download_file_interface.h
+++ b/ui/base/dragdrop/download_file_interface.h
@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 #if defined(OS_WIN)
 #include <objidl.h>
@@ -25,7 +25,7 @@ namespace ui {
 // TODO(benjhayden, anybody): Do these need to be RefCountedThreadSafe?
 
 // Defines the interface to observe the status of file download.
-class UI_EXPORT DownloadFileObserver
+class UI_BASE_EXPORT DownloadFileObserver
     : public base::RefCountedThreadSafe<DownloadFileObserver> {
  public:
   virtual void OnDownloadCompleted(const base::FilePath& file_path) = 0;
@@ -37,7 +37,7 @@ class UI_EXPORT DownloadFileObserver
 };
 
 // Defines the interface to control how a file is downloaded.
-class UI_EXPORT DownloadFileProvider
+class UI_BASE_EXPORT DownloadFileProvider
     : public base::RefCountedThreadSafe<DownloadFileProvider> {
  public:
   // Starts the download asynchronously and returns immediately.
diff --git a/ui/base/dragdrop/drag_drop_types.h b/ui/base/dragdrop/drag_drop_types.h
index ea57f95..b626b5a 100644
--- a/ui/base/dragdrop/drag_drop_types.h
+++ b/ui/base/dragdrop/drag_drop_types.h
@@ -6,11 +6,11 @@
 #define UI_BASE_DRAGDROP_DRAG_DROP_TYPES_H_
 
 #include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
-class UI_EXPORT DragDropTypes {
+class UI_BASE_EXPORT DragDropTypes {
  public:
   enum DragOperation {
     DRAG_NONE = 0,
diff --git a/ui/base/dragdrop/drag_source_win.h b/ui/base/dragdrop/drag_source_win.h
index 7c03b6c..cec2aa1 100644
--- a/ui/base/dragdrop/drag_source_win.h
+++ b/ui/base/dragdrop/drag_source_win.h
@@ -9,7 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
@@ -17,7 +17,7 @@ namespace ui {
 // drag-drop operation as the user mouses over other drop targets on their
 // system. This object tells Windows whether or not the drag should continue,
 // and supplies the appropriate cursors.
-class UI_EXPORT DragSourceWin
+class UI_BASE_EXPORT DragSourceWin
     : public IDropSource,
       public base::RefCountedThreadSafe<DragSourceWin> {
  public:
diff --git a/ui/base/dragdrop/drag_utils.h b/ui/base/dragdrop/drag_utils.h
index d31c628..5b7235f 100644
--- a/ui/base/dragdrop/drag_utils.h
+++ b/ui/base/dragdrop/drag_utils.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/files/file_path.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 class GURL;
 
@@ -30,25 +30,25 @@ namespace drag_utils {
 // Chrome (via the download manager, for example). The drag image is set into
 // the supplied data_object. 'file_name' can be a full path, but the directory
 // portion will be truncated in the drag image.
-UI_EXPORT void CreateDragImageForFile(const base::FilePath& file_name,
-                                      const gfx::ImageSkia* icon,
-                                      ui::OSExchangeData* data_object);
+UI_BASE_EXPORT void CreateDragImageForFile(const base::FilePath& file_name,
+                                           const gfx::ImageSkia* icon,
+                                           ui::OSExchangeData* data_object);
 
 // Sets the drag image on data_object from the supplied canvas. width/height
 // are the size of the image to use, and the offsets give the location of
 // the hotspot for the drag image.
-UI_EXPORT void SetDragImageOnDataObject(const gfx::Canvas& canvas,
-                                        const gfx::Size& size,
-                                        const gfx::Vector2d& cursor_offset,
-                                        ui::OSExchangeData* data_object);
+UI_BASE_EXPORT void SetDragImageOnDataObject(const gfx::Canvas& canvas,
+                                             const gfx::Size& size,
+                                             const gfx::Vector2d& cursor_offset,
+                                             ui::OSExchangeData* data_object);
 
 // Sets the drag image on data_object from the supplied ImageSkia. width/height
 // are the size of the image to use, and the offsets give the location of
 // the hotspot for the drag image.
-UI_EXPORT void SetDragImageOnDataObject(const gfx::ImageSkia& image_skia,
-                                        const gfx::Size& size,
-                                        const gfx::Vector2d& cursor_offset,
-                                        ui::OSExchangeData* data_object);
+UI_BASE_EXPORT void SetDragImageOnDataObject(const gfx::ImageSkia& image_skia,
+                                             const gfx::Size& size,
+                                             const gfx::Vector2d& cursor_offset,
+                                             ui::OSExchangeData* data_object);
 
 }  // namespace drag_utils
 
diff --git a/ui/base/dragdrop/drop_target_event.h b/ui/base/dragdrop/drop_target_event.h
index 88fcfc1..18c0630 100644
--- a/ui/base/dragdrop/drop_target_event.h
+++ b/ui/base/dragdrop/drop_target_event.h
@@ -10,7 +10,7 @@
 
 namespace ui {
 
-class UI_EXPORT DropTargetEvent : public LocatedEvent {
+class UI_BASE_EXPORT DropTargetEvent : public LocatedEvent {
  public:
   DropTargetEvent(const OSExchangeData& data,
                   const gfx::Point& location,
diff --git a/ui/base/dragdrop/drop_target_win.h b/ui/base/dragdrop/drop_target_win.h
index 0f8c56d..4536f1d 100644
--- a/ui/base/dragdrop/drop_target_win.h
+++ b/ui/base/dragdrop/drop_target_win.h
@@ -8,7 +8,7 @@
 #include <objidl.h>
 
 #include "base/memory/ref_counted.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 // Windows interface.
 struct IDropTargetHelper;
@@ -24,7 +24,7 @@ namespace ui {
 // before the HWND is deleted too.
 //
 // This class is meant to be used in a STA and is not multithread-safe.
-class UI_EXPORT DropTargetWin : public IDropTarget {
+class UI_BASE_EXPORT DropTargetWin : public IDropTarget {
  public:
   // Create a new DropTarget associating it with the given HWND.
   explicit DropTargetWin(HWND hwnd);
diff --git a/ui/base/dragdrop/gtk_dnd_util.h b/ui/base/dragdrop/gtk_dnd_util.h
index 88f00a3..b07a86d 100644
--- a/ui/base/dragdrop/gtk_dnd_util.h
+++ b/ui/base/dragdrop/gtk_dnd_util.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 class GURL;
 
@@ -39,13 +39,12 @@ enum {
 
   // Custom data for web drag/drop.
   CUSTOM_DATA = 1 << 10,
-
   INVALID_TARGET = 1 << 11,
 };
 
 // Get the atom for a given target (of the above enum type). Will return NULL
 // for non-custom targets, such as CHROME_TEXT_PLAIN.
-UI_EXPORT GdkAtom GetAtomForTarget(int target);
+UI_BASE_EXPORT GdkAtom GetAtomForTarget(int target);
 
 // Creates a target list from the given mask. The mask should be an OR of
 // CHROME_* values. The target list is returned with ref count 1; the caller
@@ -54,38 +53,38 @@ UI_EXPORT GdkAtom GetAtomForTarget(int target);
 // Since the MIME type for WEBDROP_FILE_CONTENTS depends on the file's
 // contents, that flag is ignored by this function. It is the responsibility
 // of the client code to do the right thing.
-UI_EXPORT GtkTargetList* GetTargetListFromCodeMask(int code_mask);
+UI_BASE_EXPORT GtkTargetList* GetTargetListFromCodeMask(int code_mask);
 
 // Set the drag target list for |source| with the target list that
 // corresponds to |code_mask|.
-UI_EXPORT void SetSourceTargetListFromCodeMask(GtkWidget* source,
-                                               int code_mask);
+UI_BASE_EXPORT void SetSourceTargetListFromCodeMask(GtkWidget* source,
+                                                    int code_mask);
 
 // Set the accepted targets list for |dest|. The |target_codes| array should
 // be sorted in preference order and should be terminated with -1.
-UI_EXPORT void SetDestTargetList(GtkWidget* dest, const int* target_codes);
+UI_BASE_EXPORT void SetDestTargetList(GtkWidget* dest, const int* target_codes);
 
 // Write a URL to the selection in the given type.
-UI_EXPORT void WriteURLWithName(GtkSelectionData* selection_data,
-                                const GURL& url,
-                                base::string16 title,
-                                int type);
+UI_BASE_EXPORT void WriteURLWithName(GtkSelectionData* selection_data,
+                                     const GURL& url,
+                                     base::string16 title,
+                                     int type);
 
 // Extracts data of type CHROME_NAMED_URL from |selection_data| into
 // |url| and |title|. Returns true if the url/title were safely extracted
 // and the url is valid.
-UI_EXPORT bool ExtractNamedURL(GtkSelectionData* selection_data,
-                               GURL* url,
-                               base::string16* title);
+UI_BASE_EXPORT bool ExtractNamedURL(GtkSelectionData* selection_data,
+                                    GURL* url,
+                                    base::string16* title);
 
 // Extracts data of type TEXT_URI_LIST from |selection_data| into |urls|.
-UI_EXPORT bool ExtractURIList(GtkSelectionData* selection_data,
-                              std::vector<GURL>* urls);
+UI_BASE_EXPORT bool ExtractURIList(GtkSelectionData* selection_data,
+                                   std::vector<GURL>* urls);
 
 // Extracts a Netscape URL (url\ntitle) from |selection_data|.
-UI_EXPORT bool ExtractNetscapeURL(GtkSelectionData* selection_data,
-                                  GURL* url,
-                                  base::string16* title);
+UI_BASE_EXPORT bool ExtractNetscapeURL(GtkSelectionData* selection_data,
+                                       GURL* url,
+                                       base::string16* title);
 
 }  // namespace ui
 
diff --git a/ui/base/dragdrop/os_exchange_data.h b/ui/base/dragdrop/os_exchange_data.h
index a7c85d90..f62a0d1 100644
--- a/ui/base/dragdrop/os_exchange_data.h
+++ b/ui/base/dragdrop/os_exchange_data.h
@@ -21,7 +21,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/dragdrop/download_file_interface.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 class GURL;
 class Pickle;
@@ -47,7 +47,7 @@ namespace ui {
 // TabContentsViewGtk uses a different class to handle drag support that does
 // not use OSExchangeData. As such, file contents and html support is only
 // compiled on windows.
-class UI_EXPORT OSExchangeData {
+class UI_BASE_EXPORT OSExchangeData {
  public:
   // CustomFormats are used for non-standard data types. For example, bookmark
   // nodes are written using a CustomFormat.
@@ -69,7 +69,7 @@ class UI_EXPORT OSExchangeData {
   };
 
   // Encapsulates the info about a file to be downloaded.
-  struct UI_EXPORT DownloadFileInfo {
+  struct UI_BASE_EXPORT DownloadFileInfo {
     DownloadFileInfo(const base::FilePath& filename,
                      DownloadFileProvider* downloader);
     ~DownloadFileInfo();
@@ -79,7 +79,7 @@ class UI_EXPORT OSExchangeData {
   };
 
   // Encapsulates the info about a file.
-  struct UI_EXPORT FileInfo {
+  struct UI_BASE_EXPORT FileInfo {
     FileInfo(const base::FilePath& path, const base::FilePath& display_name);
     ~FileInfo();
 
@@ -91,7 +91,7 @@ class UI_EXPORT OSExchangeData {
 
   // Provider defines the platform specific part of OSExchangeData that
   // interacts with the native system.
-  class UI_EXPORT Provider {
+  class UI_BASE_EXPORT Provider {
    public:
     Provider() {}
     virtual ~Provider() {}
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.h b/ui/base/dragdrop/os_exchange_data_provider_aura.h
index e734f42..5598edd 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_aura.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_aura.h
@@ -19,7 +19,7 @@ namespace ui {
 class Clipboard;
 
 // OSExchangeData::Provider implementation for aura on linux.
-class UI_EXPORT OSExchangeDataProviderAura
+class UI_BASE_EXPORT OSExchangeDataProviderAura
     : public OSExchangeData::Provider {
  public:
   OSExchangeDataProviderAura();
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aurax11.h b/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
index 76cfad3..0d16351 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
@@ -29,7 +29,7 @@ namespace ui {
 class Clipboard;
 
 // OSExchangeData::Provider implementation for aura on linux.
-class UI_EXPORT OSExchangeDataProviderAuraX11
+class UI_BASE_EXPORT OSExchangeDataProviderAuraX11
     : public OSExchangeData::Provider,
       public base::MessagePumpDispatcher {
  public:
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.h b/ui/base/dragdrop/os_exchange_data_provider_win.h
index ee3ccd7..300ea84 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.h
@@ -21,7 +21,7 @@
 #include "base/memory/scoped_vector.h"
 #include "base/win/scoped_comptr.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/vector2d.h"
 
@@ -124,7 +124,8 @@ class DataObjectImpl : public DownloadFileObserver,
   Observer* observer_;
 };
 
-class UI_EXPORT OSExchangeDataProviderWin : public OSExchangeData::Provider {
+class UI_BASE_EXPORT OSExchangeDataProviderWin
+    : public OSExchangeData::Provider {
  public:
   // Returns true if source has plain text that is a valid url.
   static bool HasPlainTextURL(IDataObject* source);
diff --git a/ui/base/gtk/event_synthesis_gtk.h b/ui/base/gtk/event_synthesis_gtk.h
index 1839e29..0994f9f 100644
--- a/ui/base/gtk/event_synthesis_gtk.h
+++ b/ui/base/gtk/event_synthesis_gtk.h
@@ -13,24 +13,25 @@
 #include <gdk/gdkkeysyms.h>
 #include <vector>
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace ui {
 
 // Creates and returns a key event. Passes ownership to the caller.
-UI_EXPORT GdkEvent* SynthesizeKeyEvent(GdkWindow* event_window,
-                                       bool press,
-                                       guint gdk_key,
-                                       guint state);
+UI_BASE_EXPORT GdkEvent* SynthesizeKeyEvent(GdkWindow* event_window,
+                                            bool press,
+                                            guint gdk_key,
+                                            guint state);
 
 // Creates the proper sequence of key events for a key press + release.
 // Ownership of the events in the vector is passed to the caller.
-UI_EXPORT void SynthesizeKeyPressEvents(
-    GdkWindow* window,
-    KeyboardCode key,
-    bool control, bool shift, bool alt,
-    std::vector<GdkEvent*>* events);
+UI_BASE_EXPORT void SynthesizeKeyPressEvents(GdkWindow* window,
+                                             KeyboardCode key,
+                                             bool control,
+                                             bool shift,
+                                             bool alt,
+                                             std::vector<GdkEvent*>* events);
 
 }  // namespace ui
 
diff --git a/ui/base/gtk/focus_store_gtk.h b/ui/base/gtk/focus_store_gtk.h
index b0f420d..3274c01 100644
--- a/ui/base/gtk/focus_store_gtk.h
+++ b/ui/base/gtk/focus_store_gtk.h
@@ -6,13 +6,13 @@
 #define UI_BASE_GTK_FOCUS_STORE_GTK_H_
 
 #include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 typedef struct _GtkWidget GtkWidget;
 
 namespace ui {
 
-class UI_EXPORT FocusStoreGtk {
+class UI_BASE_EXPORT FocusStoreGtk {
  public:
   FocusStoreGtk();
   ~FocusStoreGtk();
diff --git a/ui/base/gtk/g_object_destructor_filo.h b/ui/base/gtk/g_object_destructor_filo.h
index 76e41f7..14c9e5f 100644
--- a/ui/base/gtk/g_object_destructor_filo.h
+++ b/ui/base/gtk/g_object_destructor_filo.h
@@ -10,7 +10,7 @@
 #include <map>
 
 #include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 template <typename T> struct DefaultSingletonTraits;
 
@@ -48,7 +48,7 @@ namespace ui {
 // TODO(glotov): Probably worth adding ScopedGObjectDtor<T>.
 //
 // This class is a singleton. Not thread safe. Must be called within UI thread.
-class UI_EXPORT GObjectDestructorFILO {
+class UI_BASE_EXPORT GObjectDestructorFILO {
  public:
   typedef void (*DestructorHook)(void* context, GObject* where_the_object_was);
 
diff --git a/ui/base/gtk/gtk_expanded_container.h b/ui/base/gtk/gtk_expanded_container.h
index 63e3dbd..c136151 100644
--- a/ui/base/gtk/gtk_expanded_container.h
+++ b/ui/base/gtk/gtk_expanded_container.h
@@ -8,7 +8,7 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 // A specialized container derived from GtkFixed, which expands the size of its
 // children to fill the container, in one or both directions. The usage of this
@@ -57,16 +57,20 @@ struct _GtkExpandedContainerClass {
   GtkFixedClass parent_class;
 };
 
-UI_EXPORT GType gtk_expanded_container_get_type() G_GNUC_CONST;
-UI_EXPORT GtkWidget* gtk_expanded_container_new();
-UI_EXPORT void gtk_expanded_container_put(GtkExpandedContainer* container,
-                                          GtkWidget* widget, gint x, gint y);
-UI_EXPORT void gtk_expanded_container_move(GtkExpandedContainer* container,
-                                           GtkWidget* widget, gint x, gint y);
-UI_EXPORT void gtk_expanded_container_set_has_window(
+UI_BASE_EXPORT GType gtk_expanded_container_get_type() G_GNUC_CONST;
+UI_BASE_EXPORT GtkWidget* gtk_expanded_container_new();
+UI_BASE_EXPORT void gtk_expanded_container_put(GtkExpandedContainer* container,
+                                               GtkWidget* widget,
+                                               gint x,
+                                               gint y);
+UI_BASE_EXPORT void gtk_expanded_container_move(GtkExpandedContainer* container,
+                                                GtkWidget* widget,
+                                                gint x,
+                                                gint y);
+UI_BASE_EXPORT void gtk_expanded_container_set_has_window(
     GtkExpandedContainer* container,
     gboolean has_window);
-UI_EXPORT gboolean gtk_expanded_container_get_has_window(
+UI_BASE_EXPORT gboolean gtk_expanded_container_get_has_window(
     GtkExpandedContainer* container);
 
 G_END_DECLS
diff --git a/ui/base/gtk/gtk_floating_container.h b/ui/base/gtk/gtk_floating_container.h
index 2d68edd..0d91a83 100644
--- a/ui/base/gtk/gtk_floating_container.h
+++ b/ui/base/gtk/gtk_floating_container.h
@@ -8,7 +8,7 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 // A specialized container, which is a cross between a GtkBin and a
 // GtkFixed. This container dervies from GtkBin and the implementation of
@@ -76,9 +76,9 @@ struct _GtkFloatingContainerChild {
   gint y;
 };
 
-UI_EXPORT GType      gtk_floating_container_get_type() G_GNUC_CONST;
-UI_EXPORT GtkWidget* gtk_floating_container_new();
-UI_EXPORT void       gtk_floating_container_add_floating(
+UI_BASE_EXPORT GType      gtk_floating_container_get_type() G_GNUC_CONST;
+UI_BASE_EXPORT GtkWidget* gtk_floating_container_new();
+UI_BASE_EXPORT void       gtk_floating_container_add_floating(
     GtkFloatingContainer* container,
     GtkWidget* widget);
 // Use gtk_container_remove to remove all widgets; both widgets added with
diff --git a/ui/base/gtk/gtk_screen_util.h b/ui/base/gtk/gtk_screen_util.h
index b916cf2..c3a7f2c 100644
--- a/ui/base/gtk/gtk_screen_util.h
+++ b/ui/base/gtk/gtk_screen_util.h
@@ -7,7 +7,7 @@
 
 #include <gtk/gtk.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/vector2d.h"
@@ -15,19 +15,19 @@
 namespace ui {
 
 // Returns true if the screen is composited, false otherwise.
-UI_EXPORT bool IsScreenComposited();
+UI_BASE_EXPORT bool IsScreenComposited();
 
 // Get the current location of the mouse cursor relative to the screen.
-UI_EXPORT gfx::Point ScreenPoint(GtkWidget* widget);
+UI_BASE_EXPORT gfx::Point ScreenPoint(GtkWidget* widget);
 
 // Get the current location of the mouse cursor relative to the widget.
-UI_EXPORT gfx::Point ClientPoint(GtkWidget* widget);
+UI_BASE_EXPORT gfx::Point ClientPoint(GtkWidget* widget);
 
 // Gets the offset of a gtk widget from the origin in screen coordinates.
-UI_EXPORT gfx::Vector2d GetWidgetScreenOffset(GtkWidget* widget);
+UI_BASE_EXPORT gfx::Vector2d GetWidgetScreenOffset(GtkWidget* widget);
 
 // Returns the bounds of the specified widget in screen coordinates.
-UI_EXPORT gfx::Rect GetWidgetScreenBounds(GtkWidget* widget);
+UI_BASE_EXPORT gfx::Rect GetWidgetScreenBounds(GtkWidget* widget);
 
 }  // namespace ui
 
diff --git a/ui/base/gtk/gtk_signal_registrar.h b/ui/base/gtk/gtk_signal_registrar.h
index 2fa839c..37b8710 100644
--- a/ui/base/gtk/gtk_signal_registrar.h
+++ b/ui/base/gtk/gtk_signal_registrar.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 typedef void (*GCallback) (void);
 typedef struct _GObject GObject;
@@ -37,7 +37,7 @@ namespace ui {
 //
 // When |signals_| goes down, it will disconnect the handlers connected via
 // Connect.
-class UI_EXPORT GtkSignalRegistrar {
+class UI_BASE_EXPORT GtkSignalRegistrar {
  public:
   GtkSignalRegistrar();
   ~GtkSignalRegistrar();
diff --git a/ui/base/gtk/gtk_windowing.h b/ui/base/gtk/gtk_windowing.h
index 93a9335..8510779 100644
--- a/ui/base/gtk/gtk_windowing.h
+++ b/ui/base/gtk/gtk_windowing.h
@@ -7,12 +7,12 @@
 
 #include <gtk/gtk.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
 // Stacks a |popup| window directly on top of a |toplevel| window.
-UI_EXPORT void StackPopupWindow(GtkWidget* popup, GtkWidget* toplevel);
+UI_BASE_EXPORT void StackPopupWindow(GtkWidget* popup, GtkWidget* toplevel);
 
 }  // namespace ui
 
diff --git a/ui/base/gtk/owned_widget_gtk.h b/ui/base/gtk/owned_widget_gtk.h
index ba3068c..9a1166b 100644
--- a/ui/base/gtk/owned_widget_gtk.h
+++ b/ui/base/gtk/owned_widget_gtk.h
@@ -50,13 +50,13 @@
 #define UI_BASE_GTK_OWNED_WIDGET_GTK_H_
 
 #include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 typedef struct _GtkWidget GtkWidget;
 
 namespace ui {
 
-class UI_EXPORT OwnedWidgetGtk {
+class UI_BASE_EXPORT OwnedWidgetGtk {
  public:
   // Create an instance that isn't managing any ownership.
   OwnedWidgetGtk() : widget_(NULL) { }
diff --git a/ui/base/gtk/scoped_region.h b/ui/base/gtk/scoped_region.h
index faa7e81..e7a690f 100644
--- a/ui/base/gtk/scoped_region.h
+++ b/ui/base/gtk/scoped_region.h
@@ -6,7 +6,7 @@
 #define UI_BASE_GTK_SCOPED_REGION_H_
 
 #include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 typedef struct _GdkRegion GdkRegion;
 
@@ -14,7 +14,7 @@ namespace ui {
 
 // Wraps a GdkRegion. This class provides the same methods as ScopedGDIObject in
 // base/win/scoped_gdi_object.h.
-class UI_EXPORT ScopedRegion {
+class UI_BASE_EXPORT ScopedRegion {
  public:
   ScopedRegion();
   explicit ScopedRegion(GdkRegion* region);
diff --git a/ui/base/ime/chromeos/character_composer.h b/ui/base/ime/chromeos/character_composer.h
index 6dffc18..5d4267f 100644
--- a/ui/base/ime/chromeos/character_composer.h
+++ b/ui/base/ime/chromeos/character_composer.h
@@ -8,14 +8,14 @@
 #include <vector>
 
 #include "base/strings/string_util.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 class KeyEvent;
 
 // A class to recognize compose and dead key sequence.
 // Outputs composed character.
-class UI_EXPORT CharacterComposer {
+class UI_BASE_EXPORT CharacterComposer {
  public:
   CharacterComposer();
   ~CharacterComposer();
diff --git a/ui/base/ime/chromeos/ibus_bridge.h b/ui/base/ime/chromeos/ibus_bridge.h
index 4383bd8..f175eb6 100644
--- a/ui/base/ime/chromeos/ibus_bridge.h
+++ b/ui/base/ime/chromeos/ibus_bridge.h
@@ -11,7 +11,7 @@
 #include "base/callback.h"
 #include "ui/base/ime/text_input_mode.h"
 #include "ui/base/ime/text_input_type.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace gfx {
 class Rect;
@@ -28,7 +28,7 @@ class CandidateWindow;
 
 class IBusText;
 
-class UI_EXPORT IBusInputContextHandlerInterface {
+class UI_BASE_EXPORT IBusInputContextHandlerInterface {
  public:
   // Called when the engine commit a text.
   virtual void CommitText(const std::string& text) = 0;
@@ -44,7 +44,7 @@ class UI_EXPORT IBusInputContextHandlerInterface {
 
 
 // A interface to handle the engine handler method call.
-class UI_EXPORT IBusEngineHandlerInterface {
+class UI_BASE_EXPORT IBusEngineHandlerInterface {
  public:
   typedef base::Callback<void (bool consumed)> KeyEventDoneCallback;
 
@@ -106,7 +106,7 @@ class UI_EXPORT IBusEngineHandlerInterface {
 };
 
 // A interface to handle the candidate window related method call.
-class UI_EXPORT IBusPanelCandidateWindowHandlerInterface {
+class UI_BASE_EXPORT IBusPanelCandidateWindowHandlerInterface {
  public:
   virtual ~IBusPanelCandidateWindowHandlerInterface() {}
 
@@ -135,7 +135,7 @@ class UI_EXPORT IBusPanelCandidateWindowHandlerInterface {
 
 // IBusBridge provides access of each IME related handler. This class
 // is used for IME implementation.
-class UI_EXPORT IBusBridge {
+class UI_BASE_EXPORT IBusBridge {
  public:
   virtual ~IBusBridge();
 
diff --git a/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h b/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h
index 6f7829c..8dcdebb 100644
--- a/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h
+++ b/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h
@@ -7,11 +7,11 @@
 
 #include "chromeos/ime/candidate_window.h"
 #include "ui/base/ime/chromeos/ibus_bridge.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace chromeos {
 
-class UI_EXPORT MockIMECandidateWindowHandler
+class UI_BASE_EXPORT MockIMECandidateWindowHandler
     : public IBusPanelCandidateWindowHandlerInterface {
  public:
   struct UpdateLookupTableArg {
diff --git a/ui/base/ime/chromeos/mock_ime_engine_handler.h b/ui/base/ime/chromeos/mock_ime_engine_handler.h
index 3626ca5..af6097f 100644
--- a/ui/base/ime/chromeos/mock_ime_engine_handler.h
+++ b/ui/base/ime/chromeos/mock_ime_engine_handler.h
@@ -6,12 +6,12 @@
 #define UI_BASE_IME_CHROMEOS_MOCK_IME_ENGINE_HANDLER_H_
 
 #include "ui/base/ime/chromeos/ibus_bridge.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/events/event.h"
 
 namespace chromeos {
 
-class UI_EXPORT MockIMEEngineHandler : public IBusEngineHandlerInterface {
+class UI_BASE_EXPORT MockIMEEngineHandler : public IBusEngineHandlerInterface {
  public:
   MockIMEEngineHandler();
   virtual ~MockIMEEngineHandler();
diff --git a/ui/base/ime/chromeos/mock_ime_input_context_handler.h b/ui/base/ime/chromeos/mock_ime_input_context_handler.h
index a5b42b2..66823eb 100644
--- a/ui/base/ime/chromeos/mock_ime_input_context_handler.h
+++ b/ui/base/ime/chromeos/mock_ime_input_context_handler.h
@@ -7,11 +7,11 @@
 
 #include "chromeos/ime/ibus_text.h"
 #include "ui/base/ime/chromeos/ibus_bridge.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace chromeos {
 
-class UI_EXPORT MockIMEInputContextHandler
+class UI_BASE_EXPORT MockIMEInputContextHandler
     : public IBusInputContextHandlerInterface {
  public:
   struct UpdatePreeditTextArg {
diff --git a/ui/base/ime/composition_text.h b/ui/base/ime/composition_text.h
index 7d72863..e4974bd 100644
--- a/ui/base/ime/composition_text.h
+++ b/ui/base/ime/composition_text.h
@@ -7,13 +7,13 @@
 
 #include "base/strings/string16.h"
 #include "ui/base/ime/composition_underline.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/range/range.h"
 
 namespace ui {
 
 // A struct represents the status of an ongoing composition text.
-struct UI_EXPORT CompositionText {
+struct UI_BASE_EXPORT CompositionText {
   CompositionText();
   ~CompositionText();
 
diff --git a/ui/base/ime/composition_text_util_pango.h b/ui/base/ime/composition_text_util_pango.h
index 4f5123f..1116fd9 100644
--- a/ui/base/ime/composition_text_util_pango.h
+++ b/ui/base/ime/composition_text_util_pango.h
@@ -6,7 +6,7 @@
 #define UI_BASE_IME_COMPOSITION_TEXT_UTIL_PANGO_H_
 
 #include "ui/base/glib/glib_integers.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 typedef struct _PangoAttrList PangoAttrList;
 
@@ -16,7 +16,7 @@ struct CompositionText;
 
 // Extracts composition text information (text, underlines, selection range)
 // from given Gtk preedit data (utf-8 text, pango attributes, cursor position).
-UI_EXPORT void ExtractCompositionTextFromGtkPreedit(
+UI_BASE_EXPORT void ExtractCompositionTextFromGtkPreedit(
     const gchar* utf8_text,
     PangoAttrList* attrs,
     int cursor_position,
diff --git a/ui/base/ime/dummy_input_method_delegate.h b/ui/base/ime/dummy_input_method_delegate.h
index 360d0b42..4d512d8 100644
--- a/ui/base/ime/dummy_input_method_delegate.h
+++ b/ui/base/ime/dummy_input_method_delegate.h
@@ -8,12 +8,12 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/base/ime/input_method_delegate.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 namespace internal {
 
-class UI_EXPORT DummyInputMethodDelegate
+class UI_BASE_EXPORT DummyInputMethodDelegate
     : NON_EXPORTED_BASE(public InputMethodDelegate) {
  public:
   DummyInputMethodDelegate();
diff --git a/ui/base/ime/input_method_base.h b/ui/base/ime/input_method_base.h
index 10ac88d..6b3c8ef 100644
--- a/ui/base/ime/input_method_base.h
+++ b/ui/base/ime/input_method_base.h
@@ -10,7 +10,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "ui/base/ime/input_method.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace gfx {
 class Rect;
@@ -24,7 +24,7 @@ class TextInputClient;
 
 // A helper class providing functionalities shared among ui::InputMethod
 // implementations.
-class UI_EXPORT InputMethodBase
+class UI_BASE_EXPORT InputMethodBase
    : NON_EXPORTED_BASE(public InputMethod),
      public base::SupportsWeakPtr<InputMethodBase> {
  public:
diff --git a/ui/base/ime/input_method_delegate.h b/ui/base/ime/input_method_delegate.h
index ac33202..d64da92 100644
--- a/ui/base/ime/input_method_delegate.h
+++ b/ui/base/ime/input_method_delegate.h
@@ -6,7 +6,7 @@
 #define UI_BASE_IME_INPUT_METHOD_DELEGATE_H_
 
 #include "base/event_types.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"
 
@@ -15,7 +15,7 @@ namespace internal {
 
 // An interface implemented by the object that handles events sent back from an
 // ui::InputMethod implementation.
-class UI_EXPORT InputMethodDelegate {
+class UI_BASE_EXPORT InputMethodDelegate {
  public:
   virtual ~InputMethodDelegate() {}
 
diff --git a/ui/base/ime/input_method_factory.h b/ui/base/ime/input_method_factory.h
index 616e860..b170f14 100644
--- a/ui/base/ime/input_method_factory.h
+++ b/ui/base/ime/input_method_factory.h
@@ -9,7 +9,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/ime/input_method_initializer.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace ui {
@@ -20,19 +20,19 @@ class InputMethodDelegate;
 class InputMethod;
 
 // Creates a new instance of InputMethod and returns it.
-UI_EXPORT scoped_ptr<InputMethod> CreateInputMethod(
+UI_BASE_EXPORT scoped_ptr<InputMethod> CreateInputMethod(
     internal::InputMethodDelegate* delegate,
     gfx::AcceleratedWidget widget);
 
 // Makes CreateInputMethod return a MockInputMethod.
-UI_EXPORT void SetUpInputMethodFactoryForTesting();
+UI_BASE_EXPORT void SetUpInputMethodFactoryForTesting();
 
 #if defined(OS_WIN)
 // Returns a shared input method object for the platform. Caller must not
 // delete the object. Currently supported only on Windows. This method is
 // for non-Aura environment, where only one input method object is created for
 // the browser process.
-UI_EXPORT InputMethod* GetSharedInputMethod();
+UI_BASE_EXPORT InputMethod* GetSharedInputMethod();
 
 namespace internal {
 // Destroys the shared input method object returned by GetSharedInputMethod().
diff --git a/ui/base/ime/input_method_ibus.h b/ui/base/ime/input_method_ibus.h
index 46ab281..f54f204 100644
--- a/ui/base/ime/input_method_ibus.h
+++ b/ui/base/ime/input_method_ibus.h
@@ -26,7 +26,7 @@ class IBusText;
 namespace ui {
 
 // A ui::InputMethod implementation based on IBus.
-class UI_EXPORT InputMethodIBus
+class UI_BASE_EXPORT InputMethodIBus
     : public InputMethodBase,
       public chromeos::IBusInputContextHandlerInterface {
  public:
diff --git a/ui/base/ime/input_method_imm32.h b/ui/base/ime/input_method_imm32.h
index dc0a4dc..435a5eb 100644
--- a/ui/base/ime/input_method_imm32.h
+++ b/ui/base/ime/input_method_imm32.h
@@ -16,7 +16,7 @@
 namespace ui {
 
 // An InputMethod implementation based on Windows IMM32 API.
-class UI_EXPORT InputMethodIMM32 : public InputMethodWin {
+class UI_BASE_EXPORT InputMethodIMM32 : public InputMethodWin {
  public:
   InputMethodIMM32(internal::InputMethodDelegate* delegate,
                    HWND toplevel_window_handle);
diff --git a/ui/base/ime/input_method_initializer.h b/ui/base/ime/input_method_initializer.h
index fbdf673..065e53e 100644
--- a/ui/base/ime/input_method_initializer.h
+++ b/ui/base/ime/input_method_initializer.h
@@ -6,25 +6,25 @@
 #define UI_BASE_IME_INPUT_METHOD_INITIALIZER_H_
 
 #include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
 // Initializes thread-local resources for input method. This function should be
 // called in the UI thread before input method is used.
-UI_EXPORT void InitializeInputMethod();
+UI_BASE_EXPORT void InitializeInputMethod();
 
 // Shutdown thread-local resources for input method. This function should be
 // called in the UI thread after input method is used.
-UI_EXPORT void ShutdownInputMethod();
+UI_BASE_EXPORT void ShutdownInputMethod();
 
 // Initializes thread-local resources for input method. This function is
 // intended to be called from Setup function of unit tests.
-UI_EXPORT void InitializeInputMethodForTesting();
+UI_BASE_EXPORT void InitializeInputMethodForTesting();
 
 // Initializes thread-local resources for input method. This function is
 // intended to be called from TearDown function of unit tests.
-UI_EXPORT void ShutdownInputMethodForTesting();
+UI_BASE_EXPORT void ShutdownInputMethodForTesting();
 
 }  // namespace ui
 
diff --git a/ui/base/ime/input_method_minimal.h b/ui/base/ime/input_method_minimal.h
index 74c3480..84fd066 100644
--- a/ui/base/ime/input_method_minimal.h
+++ b/ui/base/ime/input_method_minimal.h
@@ -11,7 +11,7 @@ namespace ui {
 
 // A minimal implementation of ui::InputMethod, which supports only the direct
 // input without any compositions or conversions.
-class UI_EXPORT InputMethodMinimal : public InputMethodBase {
+class UI_BASE_EXPORT InputMethodMinimal : public InputMethodBase {
  public:
   explicit InputMethodMinimal(internal::InputMethodDelegate* delegate);
   virtual ~InputMethodMinimal();
diff --git a/ui/base/ime/input_method_observer.h b/ui/base/ime/input_method_observer.h
index 9ac177b..8e4355d 100644
--- a/ui/base/ime/input_method_observer.h
+++ b/ui/base/ime/input_method_observer.h
@@ -5,14 +5,14 @@
 #ifndef UI_BASE_IME_INPUT_METHOD_OBSERVER_H_
 #define UI_BASE_IME_INPUT_METHOD_OBSERVER_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
 class InputMethod;
 class TextInputClient;
 
-class UI_EXPORT InputMethodObserver {
+class UI_BASE_EXPORT InputMethodObserver {
  public:
   virtual ~InputMethodObserver() {}
 
diff --git a/ui/base/ime/input_method_tsf.h b/ui/base/ime/input_method_tsf.h
index 2b4a9bd..b01bb7e 100644
--- a/ui/base/ime/input_method_tsf.h
+++ b/ui/base/ime/input_method_tsf.h
@@ -17,7 +17,7 @@ namespace ui {
 class TSFEventRouter;
 
 // An InputMethod implementation based on Windows TSF API.
-class UI_EXPORT InputMethodTSF : public InputMethodWin {
+class UI_BASE_EXPORT InputMethodTSF : public InputMethodWin {
  public:
   InputMethodTSF(internal::InputMethodDelegate* delegate,
                  HWND toplevel_window_handle);
diff --git a/ui/base/ime/input_method_win.h b/ui/base/ime/input_method_win.h
index 2f88274..f7b95b1 100644
--- a/ui/base/ime/input_method_win.h
+++ b/ui/base/ime/input_method_win.h
@@ -17,7 +17,7 @@
 namespace ui {
 
 // A common InputMethod implementation shared between IMM32 and TSF.
-class UI_EXPORT InputMethodWin : public InputMethodBase {
+class UI_BASE_EXPORT InputMethodWin : public InputMethodBase {
  public:
   InputMethodWin(internal::InputMethodDelegate* delegate,
                  HWND toplevel_window_handle);
diff --git a/ui/base/ime/linux/linux_input_method_context.h b/ui/base/ime/linux/linux_input_method_context.h
index a0d7b1a..0bcfd0a 100644
--- a/ui/base/ime/linux/linux_input_method_context.h
+++ b/ui/base/ime/linux/linux_input_method_context.h
@@ -7,7 +7,7 @@
 
 #include "base/strings/string16.h"
 #include "ui/base/ime/text_input_type.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace gfx {
 class Rect;
@@ -20,7 +20,7 @@ class KeyEvent;
 
 // An interface of input method context for input method frameworks on
 // GNU/Linux and likes.
-class UI_EXPORT LinuxInputMethodContext {
+class UI_BASE_EXPORT LinuxInputMethodContext {
  public:
   virtual ~LinuxInputMethodContext() {}
 
@@ -42,7 +42,7 @@ class UI_EXPORT LinuxInputMethodContext {
 };
 
 // An interface of callback functions called from LinuxInputMethodContext.
-class UI_EXPORT LinuxInputMethodContextDelegate {
+class UI_BASE_EXPORT LinuxInputMethodContextDelegate {
  public:
   virtual ~LinuxInputMethodContextDelegate() {}
 
diff --git a/ui/base/ime/linux/linux_input_method_context_factory.h b/ui/base/ime/linux/linux_input_method_context_factory.h
index 8ce1ec2..af2a3a0 100644
--- a/ui/base/ime/linux/linux_input_method_context_factory.h
+++ b/ui/base/ime/linux/linux_input_method_context_factory.h
@@ -6,7 +6,7 @@
 #define UI_BASE_IME_LINUX_LINUX_INPUT_METHOD_CONTEXT_FACTORY_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
@@ -16,7 +16,7 @@ class LinuxInputMethodContextDelegate;
 // An interface that lets different Linux platforms override the
 // CreateInputMethodContext function declared here to return native input method
 // contexts.
-class UI_EXPORT LinuxInputMethodContextFactory {
+class UI_BASE_EXPORT LinuxInputMethodContextFactory {
  public:
   // Returns the current active factory or NULL.
   static const LinuxInputMethodContextFactory* instance();
diff --git a/ui/base/ime/mock_input_method.h b/ui/base/ime/mock_input_method.h
index 76b263a..495fca4 100644
--- a/ui/base/ime/mock_input_method.h
+++ b/ui/base/ime/mock_input_method.h
@@ -12,7 +12,7 @@
 #include "base/observer_list.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/input_method_observer.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
@@ -23,7 +23,7 @@ class TextInputClient;
 // of this class as the global input method with calling
 // SetUpInputMethodFactoryForTesting() which is declared in
 // ui/base/ime/input_method_factory.h
-class UI_EXPORT MockInputMethod : NON_EXPORTED_BASE(public InputMethod) {
+class UI_BASE_EXPORT MockInputMethod : NON_EXPORTED_BASE(public InputMethod) {
  public:
   explicit MockInputMethod(internal::InputMethodDelegate* delegate);
   virtual ~MockInputMethod();
diff --git a/ui/base/ime/remote_input_method_delegate_win.h b/ui/base/ime/remote_input_method_delegate_win.h
index 961ccb7..993faf8 100644
--- a/ui/base/ime/remote_input_method_delegate_win.h
+++ b/ui/base/ime/remote_input_method_delegate_win.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/rect.h"
 
 namespace ui {
@@ -16,7 +16,7 @@ namespace internal {
 
 // An interface implemented by the object to forward events that should be
 // handled by the IME which is running in the remote metro_driver process.
-class UI_EXPORT RemoteInputMethodDelegateWin {
+class UI_BASE_EXPORT RemoteInputMethodDelegateWin {
  public:
   virtual ~RemoteInputMethodDelegateWin() {}
 
diff --git a/ui/base/ime/remote_input_method_win.h b/ui/base/ime/remote_input_method_win.h
index fd5c809..942df98 100644
--- a/ui/base/ime/remote_input_method_win.h
+++ b/ui/base/ime/remote_input_method_win.h
@@ -13,7 +13,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace ui {
@@ -46,11 +46,11 @@ bool IsRemoteInputMethodWinRequired(gfx::AcceleratedWidget widget);
 // Returns the public interface of RemoteInputMethodWin.
 // Caveats: Currently only one instance of RemoteInputMethodWin is able to run
 // at the same time.
-UI_EXPORT scoped_ptr<InputMethod> CreateRemoteInputMethodWin(
+UI_BASE_EXPORT scoped_ptr<InputMethod> CreateRemoteInputMethodWin(
     internal::InputMethodDelegate* delegate);
 
 // Private interface of RemoteInputMethodWin.
-class UI_EXPORT RemoteInputMethodPrivateWin {
+class UI_BASE_EXPORT RemoteInputMethodPrivateWin {
  public:
   RemoteInputMethodPrivateWin();
 
diff --git a/ui/base/ime/text_input_client.h b/ui/base/ime/text_input_client.h
index 8623064f..2367164 100644
--- a/ui/base/ime/text_input_client.h
+++ b/ui/base/ime/text_input_client.h
@@ -11,7 +11,7 @@
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/ime/text_input_mode.h"
 #include "ui/base/ime/text_input_type.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/range/range.h"
 
@@ -22,7 +22,7 @@ class Rect;
 namespace ui {
 
 // An interface implemented by a View that needs text input support.
-class UI_EXPORT TextInputClient {
+class UI_BASE_EXPORT TextInputClient {
  public:
   virtual ~TextInputClient();
 
diff --git a/ui/base/ime/win/imm32_manager.h b/ui/base/ime/win/imm32_manager.h
index d59ab17..3a969fd 100644
--- a/ui/base/ime/win/imm32_manager.h
+++ b/ui/base/ime/win/imm32_manager.h
@@ -14,7 +14,7 @@
 #include "base/i18n/rtl.h"
 #include "base/strings/string16.h"
 #include "ui/base/ime/text_input_mode.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/rect.h"
 
 namespace ui {
@@ -74,7 +74,7 @@ struct CompositionText;
 //   hand, we can NEVER disable either TSF or CUAS in Windows Vista, i.e.
 //   THIS CLASS IS NOT ONLY USED ON THE INPUT CONTEXTS OF EAST-ASIAN
 //   LANGUAGES BUT ALSO USED ON THE INPUT CONTEXTS OF ALL LANGUAGES.
-class UI_EXPORT IMM32Manager {
+class UI_BASE_EXPORT IMM32Manager {
  public:
   IMM32Manager();
   virtual ~IMM32Manager();
diff --git a/ui/base/ime/win/tsf_bridge.h b/ui/base/ime/win/tsf_bridge.h
index 6256fac..f6d7b30 100644
--- a/ui/base/ime/win/tsf_bridge.h
+++ b/ui/base/ime/win/tsf_bridge.h
@@ -5,12 +5,12 @@
 #ifndef UI_BASE_IME_WIN_TSF_BRIDGE_H_
 #define UI_BASE_IME_WIN_TSF_BRIDGE_H_
 
-#include <Windows.h>
 #include <msctf.h>
+#include <windows.h>
 
 #include "base/basictypes.h"
 #include "base/win/scoped_comptr.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 class TextInputClient;
@@ -26,7 +26,7 @@ class TextInputClient;
 // of text inputting and current focused TextInputClient.
 //
 // All methods in this class must be used in UI thread.
-class UI_EXPORT TSFBridge {
+class UI_BASE_EXPORT TSFBridge {
  public:
   virtual ~TSFBridge();
 
diff --git a/ui/base/ime/win/tsf_event_router.h b/ui/base/ime/win/tsf_event_router.h
index 04a2a1e..bf2e4a9 100644
--- a/ui/base/ime/win/tsf_event_router.h
+++ b/ui/base/ime/win/tsf_event_router.h
@@ -15,7 +15,7 @@
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "ui/base/ime/text_input_type.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/range/range.h"
 
 struct ITfDocumentMgr;
@@ -48,7 +48,7 @@ class TSFEventRouterObserver {
 
 // This class monitores TSF related events and forwards them to given
 // |observer|.
-class UI_EXPORT TSFEventRouter {
+class UI_BASE_EXPORT TSFEventRouter {
  public:
   // Do not pass NULL to |observer|.
   explicit TSFEventRouter(TSFEventRouterObserver* observer);
diff --git a/ui/base/ime/win/tsf_input_scope.h b/ui/base/ime/win/tsf_input_scope.h
index 2e5856c..536d395 100644
--- a/ui/base/ime/win/tsf_input_scope.h
+++ b/ui/base/ime/win/tsf_input_scope.h
@@ -12,7 +12,7 @@
 #include "base/basictypes.h"
 #include "ui/base/ime/text_input_mode.h"
 #include "ui/base/ime/text_input_type.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 namespace tsf_inputscope {
@@ -20,8 +20,9 @@ namespace tsf_inputscope {
 // Returns InputScope list corresoponding to ui::TextInputType and
 // ui::TextInputMode.
 // This function is only used from following functions but declared for test.
-UI_EXPORT std::vector<InputScope> GetInputScopes(TextInputType text_input_type,
-                                                 TextInputMode text_input_mode);
+UI_BASE_EXPORT std::vector<InputScope> GetInputScopes(
+    TextInputType text_input_type,
+    TextInputMode text_input_mode);
 
 // Returns an instance of ITfInputScope, which is the Windows-specific
 // category representation corresponding to ui::TextInputType and
@@ -29,14 +30,14 @@ UI_EXPORT std::vector<InputScope> GetInputScopes(TextInputType text_input_type,
 // in the target field.
 // The returned instance has 0 reference count. The caller must maintain its
 // reference count.
-UI_EXPORT ITfInputScope* CreateInputScope(TextInputType text_input_type,
-                                          TextInputMode text_input_mode);
+UI_BASE_EXPORT ITfInputScope* CreateInputScope(TextInputType text_input_type,
+                                               TextInputMode text_input_mode);
 
 // A wrapper of the SetInputScopes API exported by msctf.dll.
 // http://msdn.microsoft.com/en-us/library/windows/desktop/ms629026.aspx
 // Does nothing on Windows XP in case TSF is disabled.
 // NOTE: For TSF-aware window, you should use ITfInputScope instead.
-UI_EXPORT void SetInputScopeForTsfUnawareWindow(
+UI_BASE_EXPORT void SetInputScopeForTsfUnawareWindow(
     HWND window_handle,
     TextInputType text_input_type,
     TextInputMode text_input_mode);
diff --git a/ui/base/ime/win/tsf_text_store.h b/ui/base/ime/win/tsf_text_store.h
index a244c57..d6672e4 100644
--- a/ui/base/ime/win/tsf_text_store.h
+++ b/ui/base/ime/win/tsf_text_store.h
@@ -13,7 +13,7 @@
 #include "base/strings/string16.h"
 #include "base/win/scoped_comptr.h"
 #include "ui/base/ime/composition_underline.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/range/range.h"
 
 namespace ui {
@@ -81,9 +81,9 @@ class TextInputClient;
 //
 // More information about TSF can be found here:
 //   http://msdn.microsoft.com/en-us/library/ms629032
-class UI_EXPORT TSFTextStore : public ITextStoreACP,
-                               public ITfContextOwnerCompositionSink,
-                               public ITfTextEditSink {
+class UI_BASE_EXPORT TSFTextStore : public ITextStoreACP,
+                                    public ITfContextOwnerCompositionSink,
+                                    public ITfTextEditSink {
  public:
   TSFTextStore();
   virtual ~TSFTextStore();
diff --git a/ui/base/l10n/l10n_font_util.h b/ui/base/l10n/l10n_font_util.h
index cfd0d81..b27b3f6 100644
--- a/ui/base/l10n/l10n_font_util.h
+++ b/ui/base/l10n/l10n_font_util.h
@@ -5,7 +5,7 @@
 #ifndef UI_BASE_L10N_FONT_UTIL_H_
 #define UI_BASE_L10N_FONT_UTIL_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/size.h"
 
 namespace gfx {
@@ -18,13 +18,13 @@ namespace ui {
 // its localized size data and the given font. The width in cols is held in a
 // localized string resource identified by |col_resource_id|, the height in the
 // same fashion.
-UI_EXPORT int GetLocalizedContentsWidthForFont(int col_resource_id,
-                                               const gfx::Font& font);
-UI_EXPORT int GetLocalizedContentsHeightForFont(int row_resource_id,
-                                                const gfx::Font& font);
-UI_EXPORT gfx::Size GetLocalizedContentsSizeForFont(int col_resource_id,
-                                                    int row_resource_id,
+UI_BASE_EXPORT int GetLocalizedContentsWidthForFont(int col_resource_id,
                                                     const gfx::Font& font);
+UI_BASE_EXPORT int GetLocalizedContentsHeightForFont(int row_resource_id,
+                                                     const gfx::Font& font);
+UI_BASE_EXPORT gfx::Size GetLocalizedContentsSizeForFont(int col_resource_id,
+                                                         int row_resource_id,
+                                                         const gfx::Font& font);
 
 }  // namespace ui
 
diff --git a/ui/base/l10n/l10n_util.h b/ui/base/l10n/l10n_util.h
index 2d254fa..4eb6d58 100644
--- a/ui/base/l10n/l10n_util.h
+++ b/ui/base/l10n/l10n_util.h
@@ -13,17 +13,18 @@
 
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 #if defined(OS_MACOSX)
 #include "ui/base/l10n/l10n_util_mac.h"
 #endif  // OS_MACOSX
 
 namespace l10n_util {
+
 // This method translates a generic locale name to one of the locally defined
 // ones. This method returns true if it succeeds.
-UI_EXPORT bool CheckAndResolveLocale(const std::string& locale,
-                                     std::string* resolved_locale);
+UI_BASE_EXPORT bool CheckAndResolveLocale(const std::string& locale,
+                                          std::string* resolved_locale);
 
 // This method is responsible for determining the locale as defined below. In
 // nearly all cases you shouldn't call this, rather use GetApplicationLocale
@@ -34,12 +35,12 @@ UI_EXPORT bool CheckAndResolveLocale(const std::string& locale,
 // as |pref_locale|), finally, we fall back on the system locale. We only return
 // a value if there's a corresponding resource DLL for the locale.  Otherwise,
 // we fall back to en-us.
-UI_EXPORT std::string GetApplicationLocale(const std::string& pref_locale);
+UI_BASE_EXPORT std::string GetApplicationLocale(const std::string& pref_locale);
 
 // Returns true if a display name for |locale| is available in the locale
 // |display_locale|.
-UI_EXPORT bool IsLocaleNameTranslated(const char* locale,
-                                      const std::string& display_locale);
+UI_BASE_EXPORT bool IsLocaleNameTranslated(const char* locale,
+                                           const std::string& display_locale);
 
 // Given a locale code, return true if the OS is capable of supporting it.
 // For instance, Oriya is not well supported on Windows XP and we return
@@ -55,24 +56,24 @@ bool IsLocaleSupportedByOS(const std::string& locale);
 // in the UI thread.
 // If |is_for_ui| is true, U+200F is appended so that it can be
 // rendered properly in a RTL Chrome.
-UI_EXPORT base::string16 GetDisplayNameForLocale(
+UI_BASE_EXPORT base::string16 GetDisplayNameForLocale(
     const std::string& locale,
     const std::string& display_locale,
     bool is_for_ui);
 
 // Returns the display name of the |country_code| in |display_locale|.
-UI_EXPORT base::string16 GetDisplayNameForCountry(
+UI_BASE_EXPORT base::string16 GetDisplayNameForCountry(
     const std::string& country_code,
     const std::string& display_locale);
 
 // Converts all - into _, to be consistent with ICU and file system names.
-UI_EXPORT std::string NormalizeLocale(const std::string& locale);
+UI_BASE_EXPORT std::string NormalizeLocale(const std::string& locale);
 
 // Produce a vector of parent locales for given locale.
 // It includes the current locale in the result.
 // sr_Cyrl_RS generates sr_Cyrl_RS, sr_Cyrl and sr.
-UI_EXPORT void GetParentLocales(const std::string& current_locale,
-                                std::vector<std::string>* parent_locales);
+UI_BASE_EXPORT void GetParentLocales(const std::string& current_locale,
+                                     std::vector<std::string>* parent_locales);
 
 // Checks if a string is plausibly a syntactically-valid locale string,
 // for cases where we want the valid input to be a locale string such as
@@ -82,102 +83,104 @@ UI_EXPORT void GetParentLocales(const std::string& current_locale,
 // accepted, but 'z', 'German', 'en-$1', or 'abcd-1234' should not.
 // Case-insensitive. Based on BCP 47, see:
 //   http://unicode.org/reports/tr35/#Unicode_Language_and_Locale_Identifiers
-UI_EXPORT bool IsValidLocaleSyntax(const std::string& locale);
+UI_BASE_EXPORT bool IsValidLocaleSyntax(const std::string& locale);
 
 //
 // Mac Note: See l10n_util_mac.h for some NSString versions and other support.
 //
 
 // Pulls resource string from the string bundle and returns it.
-UI_EXPORT std::string GetStringUTF8(int message_id);
-UI_EXPORT base::string16 GetStringUTF16(int message_id);
+UI_BASE_EXPORT std::string GetStringUTF8(int message_id);
+UI_BASE_EXPORT base::string16 GetStringUTF16(int message_id);
 
 // Get a resource string and replace $i with replacements[i] for all
 // i < replacements.size(). Additionally, $$ is replaced by $.
 // If non-NULL |offsets| will be replaced with the start points of the replaced
 // strings.
-UI_EXPORT base::string16 GetStringFUTF16(
+UI_BASE_EXPORT base::string16 GetStringFUTF16(
     int message_id,
     const std::vector<base::string16>& replacements,
     std::vector<size_t>* offsets);
 
 // Convenience wrappers for the above.
-UI_EXPORT base::string16 GetStringFUTF16(int message_id,
-                                         const base::string16& a);
-UI_EXPORT base::string16 GetStringFUTF16(int message_id,
-                                         const base::string16& a,
-                                         const base::string16& b);
-UI_EXPORT base::string16 GetStringFUTF16(int message_id,
-                                         const base::string16& a,
-                                         const base::string16& b,
-                                         const base::string16& c);
-UI_EXPORT base::string16 GetStringFUTF16(int message_id,
-                                         const base::string16& a,
-                                         const base::string16& b,
-                                         const base::string16& c,
-                                         const base::string16& d);
-UI_EXPORT base::string16 GetStringFUTF16(int message_id,
-                                         const base::string16& a,
-                                         const base::string16& b,
-                                         const base::string16& c,
-                                         const base::string16& d,
-                                         const base::string16& e);
-UI_EXPORT std::string GetStringFUTF8(int message_id,
-                                     const base::string16& a);
-UI_EXPORT std::string GetStringFUTF8(int message_id,
-                                     const base::string16& a,
-                                     const base::string16& b);
-UI_EXPORT std::string GetStringFUTF8(int message_id,
-                                     const base::string16& a,
-                                     const base::string16& b,
-                                     const base::string16& c);
-UI_EXPORT std::string GetStringFUTF8(int message_id,
-                                     const base::string16& a,
-                                     const base::string16& b,
-                                     const base::string16& c,
-                                     const base::string16& d);
+UI_BASE_EXPORT base::string16 GetStringFUTF16(int message_id,
+                                              const base::string16& a);
+UI_BASE_EXPORT base::string16 GetStringFUTF16(int message_id,
+                                              const base::string16& a,
+                                              const base::string16& b);
+UI_BASE_EXPORT base::string16 GetStringFUTF16(int message_id,
+                                              const base::string16& a,
+                                              const base::string16& b,
+                                              const base::string16& c);
+UI_BASE_EXPORT base::string16 GetStringFUTF16(int message_id,
+                                              const base::string16& a,
+                                              const base::string16& b,
+                                              const base::string16& c,
+                                              const base::string16& d);
+UI_BASE_EXPORT base::string16 GetStringFUTF16(int message_id,
+                                              const base::string16& a,
+                                              const base::string16& b,
+                                              const base::string16& c,
+                                              const base::string16& d,
+                                              const base::string16& e);
+UI_BASE_EXPORT std::string GetStringFUTF8(int message_id,
+                                          const base::string16& a);
+UI_BASE_EXPORT std::string GetStringFUTF8(int message_id,
+                                          const base::string16& a,
+                                          const base::string16& b);
+UI_BASE_EXPORT std::string GetStringFUTF8(int message_id,
+                                          const base::string16& a,
+                                          const base::string16& b,
+                                          const base::string16& c);
+UI_BASE_EXPORT std::string GetStringFUTF8(int message_id,
+                                          const base::string16& a,
+                                          const base::string16& b,
+                                          const base::string16& c,
+                                          const base::string16& d);
 
 // Variants that return the offset(s) of the replaced parameters. The
 // vector based version returns offsets ordered by parameter. For example if
 // invoked with a and b offsets[0] gives the offset for a and offsets[1] the
 // offset of b regardless of where the parameters end up in the string.
-UI_EXPORT base::string16 GetStringFUTF16(int message_id,
-                                         const base::string16& a,
-                                         size_t* offset);
-UI_EXPORT base::string16 GetStringFUTF16(int message_id,
-                                         const base::string16& a,
-                                         const base::string16& b,
-                                         std::vector<size_t>* offsets);
+UI_BASE_EXPORT base::string16 GetStringFUTF16(int message_id,
+                                              const base::string16& a,
+                                              size_t* offset);
+UI_BASE_EXPORT base::string16 GetStringFUTF16(int message_id,
+                                              const base::string16& a,
+                                              const base::string16& b,
+                                              std::vector<size_t>* offsets);
 
 // Convenience functions to get a string with a single number as a parameter.
-UI_EXPORT base::string16 GetStringFUTF16Int(int message_id, int a);
+UI_BASE_EXPORT base::string16 GetStringFUTF16Int(int message_id, int a);
 base::string16 GetStringFUTF16Int(int message_id, int64 a);
 
 // Get a resource string using |number| to decide which of |message_ids| should
 // be used. |message_ids| must be size 6 and in order: default, singular, zero,
 // two, few, many.
-UI_EXPORT base::string16 GetPluralStringFUTF16(
+UI_BASE_EXPORT base::string16 GetPluralStringFUTF16(
+    const std::vector<int>& message_ids,
+    int number);
+UI_BASE_EXPORT std::string GetPluralStringFUTF8(
     const std::vector<int>& message_ids,
     int number);
-UI_EXPORT std::string GetPluralStringFUTF8(const std::vector<int>& message_ids,
-                                           int number);
 
-// In place sorting of base::string16 strings using collation rules for |locale|.
-UI_EXPORT void SortStrings16(const std::string& locale,
-                             std::vector<base::string16>* strings);
+// In place sorting of base::string16 strings using collation rules for
+// |locale|.
+UI_BASE_EXPORT void SortStrings16(const std::string& locale,
+                                  std::vector<base::string16>* strings);
 
 // Returns a vector of available locale codes. E.g., a vector containing
 // en-US, es, fr, fi, pt-PT, pt-BR, etc.
-UI_EXPORT const std::vector<std::string>& GetAvailableLocales();
+UI_BASE_EXPORT const std::vector<std::string>& GetAvailableLocales();
 
 // Returns a vector of locale codes usable for accept-languages.
-UI_EXPORT void GetAcceptLanguagesForLocale(
+UI_BASE_EXPORT void GetAcceptLanguagesForLocale(
     const std::string& display_locale,
     std::vector<std::string>* locale_codes);
 
 // Returns the preferred size of the contents view of a window based on
 // designer given constraints which might dependent on the language used.
-UI_EXPORT int GetLocalizedContentsWidthInPixels(int pixel_resource_id);
+UI_BASE_EXPORT int GetLocalizedContentsWidthInPixels(int pixel_resource_id);
 
 }  // namespace l10n_util
 
diff --git a/ui/base/l10n/l10n_util_android.h b/ui/base/l10n/l10n_util_android.h
index b7639d2..91ea02e 100644
--- a/ui/base/l10n/l10n_util_android.h
+++ b/ui/base/l10n/l10n_util_android.h
@@ -10,18 +10,18 @@
 #include <string>
 
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace l10n_util {
 
 // Return the current default locale of the device.
-UI_EXPORT std::string GetDefaultLocale();
+UI_BASE_EXPORT std::string GetDefaultLocale();
 
-UI_EXPORT base::string16 GetDisplayNameForLocale(
+UI_BASE_EXPORT base::string16 GetDisplayNameForLocale(
     const std::string& locale,
     const std::string& display_locale);
 
-UI_EXPORT bool RegisterLocalizationUtil(JNIEnv* env);
+UI_BASE_EXPORT bool RegisterLocalizationUtil(JNIEnv* env);
 
 }  // namespace l10n_util
 
diff --git a/ui/base/l10n/l10n_util_collator.h b/ui/base/l10n/l10n_util_collator.h
index f16065d..e1b91ab 100644
--- a/ui/base/l10n/l10n_util_collator.h
+++ b/ui/base/l10n/l10n_util_collator.h
@@ -13,7 +13,7 @@
 #include "base/i18n/string_compare.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/icu/source/i18n/unicode/coll.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace l10n_util {
 
@@ -106,7 +106,7 @@ class StringComparator : public std::binary_function<const Element&,
 };
 
 // Specialization of operator() method for base::string16 version.
-template <> UI_EXPORT
+template <> UI_BASE_EXPORT
 bool StringComparator<base::string16>::operator()(const base::string16& lhs,
                                                   const base::string16& rhs);
 
diff --git a/ui/base/l10n/l10n_util_mac.h b/ui/base/l10n/l10n_util_mac.h
index b2a88ce..74bc58b 100644
--- a/ui/base/l10n/l10n_util_mac.h
+++ b/ui/base/l10n/l10n_util_mac.h
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 #ifdef __OBJC__
 @class NSString;
@@ -23,59 +23,58 @@ namespace l10n_util {
 // Remove the Windows-style accelerator marker (for labels, menuitems, etc.)
 // and change "..." into an ellipsis.
 // Returns the result in an autoreleased NSString.
-UI_EXPORT NSString* FixUpWindowsStyleLabel(const base::string16& label);
+UI_BASE_EXPORT NSString* FixUpWindowsStyleLabel(const base::string16& label);
 
 // Pulls resource string from the string bundle and returns it.
-UI_EXPORT NSString* GetNSString(int message_id);
+UI_BASE_EXPORT NSString* GetNSString(int message_id);
 
 // Get a resource string and replace $1-$2-$3 with |a| and |b|
 // respectively.  Additionally, $$ is replaced by $.
-UI_EXPORT NSString* GetNSStringF(int message_id,
-                                 const base::string16& a);
-UI_EXPORT NSString* GetNSStringF(int message_id,
-                                 const base::string16& a,
-                                 const base::string16& b);
-UI_EXPORT NSString* GetNSStringF(int message_id,
-                                 const base::string16& a,
-                                 const base::string16& b,
-                                 const base::string16& c);
-UI_EXPORT NSString* GetNSStringF(int message_id,
-                                 const base::string16& a,
-                                 const base::string16& b,
-                                 const base::string16& c,
-                                 const base::string16& d);
+UI_BASE_EXPORT NSString* GetNSStringF(int message_id, const base::string16& a);
+UI_BASE_EXPORT NSString* GetNSStringF(int message_id,
+                                      const base::string16& a,
+                                      const base::string16& b);
+UI_BASE_EXPORT NSString* GetNSStringF(int message_id,
+                                      const base::string16& a,
+                                      const base::string16& b,
+                                      const base::string16& c);
+UI_BASE_EXPORT NSString* GetNSStringF(int message_id,
+                                      const base::string16& a,
+                                      const base::string16& b,
+                                      const base::string16& c,
+                                      const base::string16& d);
 
 // Variants that return the offset(s) of the replaced parameters. (See
 // app/l10n_util.h for more details.)
-UI_EXPORT NSString* GetNSStringF(int message_id,
-                                 const base::string16& a,
-                                 const base::string16& b,
-                                 std::vector<size_t>* offsets);
+UI_BASE_EXPORT NSString* GetNSStringF(int message_id,
+                                      const base::string16& a,
+                                      const base::string16& b,
+                                      std::vector<size_t>* offsets);
 
 // Same as GetNSString, but runs the result through FixUpWindowsStyleLabel
 // before returning it.
-UI_EXPORT NSString* GetNSStringWithFixup(int message_id);
+UI_BASE_EXPORT NSString* GetNSStringWithFixup(int message_id);
 
 // Same as GetNSStringF, but runs the result through FixUpWindowsStyleLabel
 // before returning it.
-UI_EXPORT NSString* GetNSStringFWithFixup(int message_id,
-                                          const base::string16& a);
-UI_EXPORT NSString* GetNSStringFWithFixup(int message_id,
-                                          const base::string16& a,
-                                          const base::string16& b);
-UI_EXPORT NSString* GetNSStringFWithFixup(int message_id,
-                                          const base::string16& a,
-                                          const base::string16& b,
-                                          const base::string16& c);
-UI_EXPORT NSString* GetNSStringFWithFixup(int message_id,
-                                          const base::string16& a,
-                                          const base::string16& b,
-                                          const base::string16& c,
-                                          const base::string16& d);
+UI_BASE_EXPORT NSString* GetNSStringFWithFixup(int message_id,
+                                               const base::string16& a);
+UI_BASE_EXPORT NSString* GetNSStringFWithFixup(int message_id,
+                                               const base::string16& a,
+                                               const base::string16& b);
+UI_BASE_EXPORT NSString* GetNSStringFWithFixup(int message_id,
+                                               const base::string16& a,
+                                               const base::string16& b,
+                                               const base::string16& c);
+UI_BASE_EXPORT NSString* GetNSStringFWithFixup(int message_id,
+                                               const base::string16& a,
+                                               const base::string16& b,
+                                               const base::string16& c,
+                                               const base::string16& d);
 
 // Support the override of the locale with the value from Cocoa.
-UI_EXPORT void OverrideLocaleWithCocoaLocale();
-UI_EXPORT const std::string& GetLocaleOverride();
+UI_BASE_EXPORT void OverrideLocaleWithCocoaLocale();
+UI_BASE_EXPORT const std::string& GetLocaleOverride();
 
 }  // namespace l10n_util
 
diff --git a/ui/base/l10n/l10n_util_win.h b/ui/base/l10n/l10n_util_win.h
index d0338f7..75bfe5d 100644
--- a/ui/base/l10n/l10n_util_win.h
+++ b/ui/base/l10n/l10n_util_win.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace l10n_util {
 
@@ -19,17 +19,17 @@ namespace l10n_util {
 // (e.g. WS_EX_LAYOUTRTL, WS_EX_RTLREADING, etc.) when creating a window.
 // Callers should OR this value into their extended style value when creating
 // a window.
-UI_EXPORT int GetExtendedStyles();
+UI_BASE_EXPORT int GetExtendedStyles();
 
 // TODO(xji):
 // This is a temporary name, it will eventually replace GetExtendedStyles
-UI_EXPORT int GetExtendedTooltipStyles();
+UI_BASE_EXPORT int GetExtendedTooltipStyles();
 
 // Give an HWND, this function sets the WS_EX_LAYOUTRTL extended style for the
 // underlying window. When this style is set, the UI for the window is going to
 // be mirrored. This is generally done for the UI of right-to-left languages
 // such as Hebrew.
-UI_EXPORT void HWNDSetRTLLayout(HWND hwnd);
+UI_BASE_EXPORT void HWNDSetRTLLayout(HWND hwnd);
 
 // See http://blogs.msdn.com/oldnewthing/archive/2005/09/15/467598.aspx
 // and  http://blogs.msdn.com/oldnewthing/archive/2006/06/26/647365.aspx
@@ -40,14 +40,15 @@ UI_EXPORT void HWNDSetRTLLayout(HWND hwnd);
 // override_font_family and font_size_scaler are not null, they'll be
 // filled with the font family name and the size scaler.  The output
 // parameters are not modified if the return value is false.
-UI_EXPORT bool NeedOverrideDefaultUIFont(base::string16* override_font_family,
-                                         double* font_size_scaler);
+UI_BASE_EXPORT bool NeedOverrideDefaultUIFont(
+    base::string16* override_font_family,
+    double* font_size_scaler);
 
 // If the default UI font stored in |logfont| is not suitable, its family
 // and size are replaced with those stored in the per-locale resource. The
 // font size is adjusted based on the font scale setting in the OS preferences.
 // Windows 8 supports scale factors of 1, 1.4 and 1.8.
-UI_EXPORT void AdjustUIFont(LOGFONT* logfont);
+UI_BASE_EXPORT void AdjustUIFont(LOGFONT* logfont);
 
 // If the default UI font stored in |logfont| is not suitable, its family
 // and size are replaced with those stored in the per-locale resource. The
@@ -55,17 +56,17 @@ UI_EXPORT void AdjustUIFont(LOGFONT* logfont);
 // baseline of 96 DPI.  This ratio is also used for converting sizes from
 // device independent pixels (DIP) to physical pixels. The font size is scaled
 // for use with Views and Aura which work in DIP.
-UI_EXPORT void AdjustUIFontForDIP(float dpi_scale, LOGFONT* logfont);
+UI_BASE_EXPORT void AdjustUIFontForDIP(float dpi_scale, LOGFONT* logfont);
 
 // If the font for a given window (pointed to by HWND) is not suitable for the
 // UI in the current UI langauge, its family and size are replaced with those
 // stored in the per-locale resource.
-UI_EXPORT void AdjustUIFontForWindow(HWND hwnd);
+UI_BASE_EXPORT void AdjustUIFontForWindow(HWND hwnd);
 
 // Allow processes to override the configured locale with the user's Windows UI
 // languages.  This function should generally be called once early in
 // Application startup.
-UI_EXPORT void OverrideLocaleWithUILanguageList();
+UI_BASE_EXPORT void OverrideLocaleWithUILanguageList();
 
 // Retrieve the locale override, or an empty vector if the locale has not been
 // or failed to be overridden.
diff --git a/ui/base/l10n/time_format.h b/ui/base/l10n/time_format.h
index 0b3a1be..ff1e051 100644
--- a/ui/base/l10n/time_format.h
+++ b/ui/base/l10n/time_format.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace base {
 class Time;
@@ -17,7 +17,7 @@ class TimeDelta;
 namespace ui {
 
 // Methods to format time values as strings.
-class UI_EXPORT TimeFormat {
+class UI_BASE_EXPORT TimeFormat {
  public:
   // TimeElapsed, TimeRemaining and TimeRemainingShort functions:
   // These functions return a localized string of approximate time duration. The
diff --git a/ui/base/layout.h b/ui/base/layout.h
index 6179a84..2ea39a2 100644
--- a/ui/base/layout.h
+++ b/ui/base/layout.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "build/build_config.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace ui {
@@ -26,7 +26,7 @@ enum DisplayLayout {
 // the .pak file of theme resources to load.
 // WARNING: this is deprecated and will be nuked as soon as aura is the default
 // on windows.
-UI_EXPORT DisplayLayout GetDisplayLayout();
+UI_BASE_EXPORT DisplayLayout GetDisplayLayout();
 
 // Supported UI scale factors for the platform. This is used as an index
 // into the array |kScaleFactorScales| which maps the enum value to a float.
@@ -50,37 +50,37 @@ enum ScaleFactor {
 // Changes the value of GetSupportedScaleFactors() to |scale_factors|.
 // Use ScopedSetSupportedScaleFactors for unit tests as not to affect the
 // state of other tests.
-UI_EXPORT void SetSupportedScaleFactors(
+UI_BASE_EXPORT void SetSupportedScaleFactors(
     const std::vector<ScaleFactor>& scale_factors);
 
 // Returns a vector with the scale factors which are supported by this
 // platform, in ascending order.
-UI_EXPORT const std::vector<ScaleFactor>& GetSupportedScaleFactors();
+UI_BASE_EXPORT const std::vector<ScaleFactor>& GetSupportedScaleFactors();
 
 // Returns the float scale value for |scale_factor|.
-UI_EXPORT float GetImageScale(ScaleFactor scale_factor);
+UI_BASE_EXPORT float GetImageScale(ScaleFactor scale_factor);
 
 // Returns the supported ScaleFactor which most closely matches |scale|.
 // Converting from float to ScaleFactor is inefficient and should be done as
 // little as possible.
 // TODO(oshima): Make ScaleFactor a class and remove this.
-UI_EXPORT ScaleFactor GetSupportedScaleFactor(float image_scale);
+UI_BASE_EXPORT ScaleFactor GetSupportedScaleFactor(float image_scale);
 
 // Returns the ScaleFactor used by |view|.
-UI_EXPORT ScaleFactor GetScaleFactorForNativeView(gfx::NativeView view);
+UI_BASE_EXPORT ScaleFactor GetScaleFactorForNativeView(gfx::NativeView view);
 
 // Returns true if |scale_factor| is supported by this platform.
-UI_EXPORT bool IsScaleFactorSupported(ScaleFactor scale_factor);
+UI_BASE_EXPORT bool IsScaleFactorSupported(ScaleFactor scale_factor);
 
 // Returns the scale factor closest to |scale| from the full list of factors.
 // Note that it does NOT rely on the list of supported scale factors.
 // Finding the closest match is inefficient and shouldn't be done frequently.
-UI_EXPORT ScaleFactor FindClosestScaleFactorUnsafe(float scale);
+UI_BASE_EXPORT ScaleFactor FindClosestScaleFactorUnsafe(float scale);
 
 namespace test {
 // Class which changes the value of GetSupportedScaleFactors() to
 // |new_scale_factors| for the duration of its lifetime.
-class UI_EXPORT ScopedSetSupportedScaleFactors {
+class UI_BASE_EXPORT ScopedSetSupportedScaleFactors {
  public:
   explicit ScopedSetSupportedScaleFactors(
       const std::vector<ui::ScaleFactor>& new_scale_factors);
diff --git a/ui/base/models/button_menu_item_model.h b/ui/base/models/button_menu_item_model.h
index b9875b2..b0bc95b 100644
--- a/ui/base/models/button_menu_item_model.h
+++ b/ui/base/models/button_menu_item_model.h
@@ -8,13 +8,13 @@
 #include <vector>
 
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
 // A model representing the rows of buttons that should be inserted in a button
 // containing menu item.
-class UI_EXPORT ButtonMenuItemModel {
+class UI_BASE_EXPORT ButtonMenuItemModel {
  public:
   // Types of buttons.
   enum ButtonType {
@@ -23,7 +23,7 @@ class UI_EXPORT ButtonMenuItemModel {
     TYPE_BUTTON_LABEL
   };
 
-  class UI_EXPORT Delegate {
+  class UI_BASE_EXPORT Delegate {
    public:
     // Some command ids have labels that change over time.
     virtual bool IsItemForCommandIdDynamic(int command_id) const;
diff --git a/ui/base/models/combobox_model.h b/ui/base/models/combobox_model.h
index 1022685..3618109 100644
--- a/ui/base/models/combobox_model.h
+++ b/ui/base/models/combobox_model.h
@@ -6,14 +6,14 @@
 #define UI_BASE_MODELS_COMBOBOX_MODEL_H_
 
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
 class ComboboxModelObserver;
 
 // A data model for a combo box.
-class UI_EXPORT ComboboxModel {
+class UI_BASE_EXPORT ComboboxModel {
  public:
   // Returns the number of items in the combo box.
   virtual int GetItemCount() const = 0;
diff --git a/ui/base/models/combobox_model_observer.h b/ui/base/models/combobox_model_observer.h
index c43e52d..f8e281e 100644
--- a/ui/base/models/combobox_model_observer.h
+++ b/ui/base/models/combobox_model_observer.h
@@ -5,14 +5,14 @@
 #ifndef UI_BASE_MODELS_COMBOBOX_MODEL_OBSERVER_H_
 #define UI_BASE_MODELS_COMBOBOX_MODEL_OBSERVER_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
 class ComboboxModel;
 
 // Observer for the ComboboxModel.
-class UI_EXPORT ComboboxModelObserver {
+class UI_BASE_EXPORT ComboboxModelObserver {
  public:
   // Invoked when |model| has changed in some way. The observer should assume
   // everything changed.
diff --git a/ui/base/models/dialog_model.h b/ui/base/models/dialog_model.h
index f7254c5..853eb28 100644
--- a/ui/base/models/dialog_model.h
+++ b/ui/base/models/dialog_model.h
@@ -6,15 +6,15 @@
 #define UI_BASE_MODELS_DIALOG_MODEL_H_
 
 #include "base/strings/string16.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/base/ui_base_types.h"
-#include "ui/base/ui_export.h"
 
 namespace ui {
 
 // A model representing a dialog window. The model provides the content to show
 // to the user (i.e. label, title), and the ways the user can interact with it
 // (i.e. the buttons).
-class UI_EXPORT DialogModel {
+class UI_BASE_EXPORT DialogModel {
  public:
   virtual ~DialogModel();
 
diff --git a/ui/base/models/list_model_observer.h b/ui/base/models/list_model_observer.h
index 3f59da9..cc8be0f 100644
--- a/ui/base/models/list_model_observer.h
+++ b/ui/base/models/list_model_observer.h
@@ -7,11 +7,11 @@
 
 #include <stddef.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
-class UI_EXPORT ListModelObserver {
+class UI_BASE_EXPORT ListModelObserver {
  public:
   // Invoked after items has been added to the model.
   virtual void ListItemsAdded(size_t start, size_t count) = 0;
diff --git a/ui/base/models/list_selection_model.h b/ui/base/models/list_selection_model.h
index 8a17509..234714d 100644
--- a/ui/base/models/list_selection_model.h
+++ b/ui/base/models/list_selection_model.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
@@ -21,7 +21,7 @@ namespace ui {
 //
 // Typically there is only one selected item, in which case the anchor and
 // active index correspond to the same thing.
-class UI_EXPORT ListSelectionModel {
+class UI_BASE_EXPORT ListSelectionModel {
  public:
   typedef std::vector<int> SelectedIndices;
 
diff --git a/ui/base/models/menu_model.h b/ui/base/models/menu_model.h
index bd3730c..af40f6b 100644
--- a/ui/base/models/menu_model.h
+++ b/ui/base/models/menu_model.h
@@ -8,7 +8,7 @@
 #include "base/strings/string16.h"
 #include "ui/base/models/menu_model_delegate.h"
 #include "ui/base/models/menu_separator_types.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/native_widget_types.h"
 
@@ -23,7 +23,7 @@ class Accelerator;
 class ButtonMenuItemModel;
 
 // An interface implemented by an object that provides the content of a menu.
-class UI_EXPORT MenuModel {
+class UI_BASE_EXPORT MenuModel {
  public:
   // The type of item.
   enum ItemType {
diff --git a/ui/base/models/simple_menu_model.h b/ui/base/models/simple_menu_model.h
index 69a227b..8cd936b 100644
--- a/ui/base/models/simple_menu_model.h
+++ b/ui/base/models/simple_menu_model.h
@@ -23,9 +23,9 @@ class ButtonMenuItemModel;
 // items. This makes it easy to construct fixed menus. Menus populated by
 // dynamic data sources may be better off implementing MenuModel directly.
 // The breadth of MenuModel is not exposed through this API.
-class UI_EXPORT SimpleMenuModel : public MenuModel {
+class UI_BASE_EXPORT SimpleMenuModel : public MenuModel {
  public:
-  class UI_EXPORT Delegate {
+  class UI_BASE_EXPORT Delegate {
    public:
     // Methods for determining the state of specific command ids.
     virtual bool IsCommandIdChecked(int command_id) const = 0;
diff --git a/ui/base/models/table_model.h b/ui/base/models/table_model.h
index 5792bfe..68cf202 100644
--- a/ui/base/models/table_model.h
+++ b/ui/base/models/table_model.h
@@ -9,7 +9,7 @@
 
 #include "base/strings/string16.h"
 #include "third_party/icu/source/i18n/unicode/coll.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace gfx {
 class ImageSkia;
@@ -20,7 +20,7 @@ namespace ui {
 class TableModelObserver;
 
 // The model driving the TableView.
-class UI_EXPORT TableModel {
+class UI_BASE_EXPORT TableModel {
  public:
   // See HasGroups, get GetGroupID for details as to how this is used.
   struct Group {
@@ -91,7 +91,7 @@ class UI_EXPORT TableModel {
 };
 
 // TableColumn specifies the title, alignment and size of a particular column.
-struct UI_EXPORT TableColumn {
+struct UI_BASE_EXPORT TableColumn {
   enum Alignment {
     LEFT, RIGHT, CENTER
   };
diff --git a/ui/base/models/table_model_observer.h b/ui/base/models/table_model_observer.h
index 21ee645..4c9d0eb 100644
--- a/ui/base/models/table_model_observer.h
+++ b/ui/base/models/table_model_observer.h
@@ -5,13 +5,13 @@
 #ifndef UI_BASE_MODELS_TABLE_MODEL_OBSERVER_H_
 #define UI_BASE_MODELS_TABLE_MODEL_OBSERVER_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
 // Observer for a TableModel. Anytime the model changes, it must notify its
 // observer.
-class UI_EXPORT TableModelObserver {
+class UI_BASE_EXPORT TableModelObserver {
  public:
   // Invoked when the model has been completely changed.
   virtual void OnModelChanged() = 0;
diff --git a/ui/base/models/tree_model.h b/ui/base/models/tree_model.h
index 3ebe745..d553a40 100644
--- a/ui/base/models/tree_model.h
+++ b/ui/base/models/tree_model.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace gfx {
 class ImageSkia;
@@ -31,7 +31,7 @@ class TreeModelNode {
 };
 
 // Observer for the TreeModel. Notified of significant events to the model.
-class UI_EXPORT TreeModelObserver {
+class UI_BASE_EXPORT TreeModelObserver {
  public:
   // Notification that nodes were added to the specified parent.
   virtual void TreeNodesAdded(TreeModel* model,
@@ -55,7 +55,7 @@ class UI_EXPORT TreeModelObserver {
 // TreeModel ------------------------------------------------------------------
 
 // The model for TreeView.
-class UI_EXPORT TreeModel {
+class UI_BASE_EXPORT TreeModel {
  public:
   // Returns the root of the tree. This may or may not be shown in the tree,
   // see SetRootShown for details.
diff --git a/ui/base/resource/data_pack.h b/ui/base/resource/data_pack.h
index a1a92c5..4d9d4bb 100644
--- a/ui/base/resource/data_pack.h
+++ b/ui/base/resource/data_pack.h
@@ -17,7 +17,7 @@
 #include "base/strings/string_piece.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_handle.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace base {
 class FilePath;
@@ -27,7 +27,7 @@ class RefCountedStaticMemory;
 
 namespace ui {
 
-class UI_EXPORT DataPack : public ResourceHandle {
+class UI_BASE_EXPORT DataPack : public ResourceHandle {
  public:
   DataPack(ui::ScaleFactor scale_factor);
   virtual ~DataPack();
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h
index 9df8705..9ce2466 100644
--- a/ui/base/resource/resource_bundle.h
+++ b/ui/base/resource/resource_bundle.h
@@ -19,7 +19,7 @@
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 #include "ui/base/layout.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/native_widget_types.h"
@@ -38,7 +38,7 @@ class ResourceHandle;
 
 // ResourceBundle is a central facility to load images and other resources,
 // such as theme graphics. Every resource is loaded only once.
-class UI_EXPORT ResourceBundle {
+class UI_BASE_EXPORT ResourceBundle {
  public:
   // An enumeration of the various font styles used throughout Chrome.
   // The following holds true for the font sizes:
diff --git a/ui/base/resource/resource_bundle_win.h b/ui/base/resource/resource_bundle_win.h
index 9a75bed..811464e 100644
--- a/ui/base/resource/resource_bundle_win.h
+++ b/ui/base/resource/resource_bundle_win.h
@@ -10,16 +10,16 @@
 #include <windows.h>
 
 #include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
 // NOTE: This needs to be called before initializing ResourceBundle if your
 // resources are not stored in the executable.
-UI_EXPORT void SetResourcesDataDLL(HINSTANCE handle);
+UI_BASE_EXPORT void SetResourcesDataDLL(HINSTANCE handle);
 
 // Loads and returns an icon from the app module.
-UI_EXPORT HICON LoadThemeIconFromResourcesDataDLL(int icon_id);
+UI_BASE_EXPORT HICON LoadThemeIconFromResourcesDataDLL(int icon_id);
 
 }  // namespace ui
 
diff --git a/ui/base/resource/resource_handle.h b/ui/base/resource/resource_handle.h
index 14be54e..11eeac1 100644
--- a/ui/base/resource/resource_handle.h
+++ b/ui/base/resource/resource_handle.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/strings/string_piece.h"
 #include "ui/base/layout.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace base {
 class RefCountedStaticMemory;
@@ -16,7 +16,7 @@ class RefCountedStaticMemory;
 
 namespace ui {
 
-class UI_EXPORT ResourceHandle {
+class UI_BASE_EXPORT ResourceHandle {
  public:
   // What type of encoding the text resources use.
   enum TextEncodingType {
diff --git a/ui/base/text/bytes_formatting.h b/ui/base/text/bytes_formatting.h
index 0e81818..46de51c 100644
--- a/ui/base/text/bytes_formatting.h
+++ b/ui/base/text/bytes_formatting.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
@@ -16,12 +16,12 @@ namespace ui {
 // Simple call to return a byte quantity as a string in human-readable format.
 // Ex: FormatBytes(512) => "512 B"
 // Ex: FormatBytes(101479) => "99.1 kB"
-UI_EXPORT base::string16 FormatBytes(int64 bytes);
+UI_BASE_EXPORT base::string16 FormatBytes(int64 bytes);
 
 // Simple call to return a speed as a string in human-readable format.
 // Ex: FormatSpeed(512) => "512 B/s"
 // Ex: FormatSpeed(101479) => "99.1 kB/s"
-UI_EXPORT base::string16 FormatSpeed(int64 bytes);
+UI_BASE_EXPORT base::string16 FormatSpeed(int64 bytes);
 
 // Less-Simple API -------------------------------------------------------------
 
@@ -37,15 +37,15 @@ enum DataUnits {
 // Return the unit type that is appropriate for displaying the amount of bytes
 // passed in. Most of the time, an explicit call to this isn't necessary; just
 // use FormatBytes()/FormatSpeed() above.
-UI_EXPORT DataUnits GetByteDisplayUnits(int64 bytes);
+UI_BASE_EXPORT DataUnits GetByteDisplayUnits(int64 bytes);
 
 // Return a byte quantity as a string in human-readable format with an optional
 // unit suffix. Specify in the |units| argument the units to be used.
 // Ex: FormatBytes(512, DATA_UNITS_KIBIBYTE, true) => "0.5 kB"
 // Ex: FormatBytes(10*1024, DATA_UNITS_MEBIBYTE, false) => "0.1"
-UI_EXPORT base::string16 FormatBytesWithUnits(int64 bytes,
-                                              DataUnits units,
-                                              bool show_units);
+UI_BASE_EXPORT base::string16 FormatBytesWithUnits(int64 bytes,
+                                                   DataUnits units,
+                                                   bool show_units);
 
 // As above, but with "/s" units for speed values.
 // Ex: FormatSpeed(512, DATA_UNITS_KIBIBYTE, true) => "0.5 kB/s"
diff --git a/ui/base/theme_provider.h b/ui/base/theme_provider.h
index d12e265..15e7837 100644
--- a/ui/base/theme_provider.h
+++ b/ui/base/theme_provider.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/layout.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 #if defined(OS_MACOSX)
 #ifdef __OBJC__
@@ -46,7 +46,7 @@ namespace ui {
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-class UI_EXPORT ThemeProvider {
+class UI_BASE_EXPORT ThemeProvider {
  public:
   virtual ~ThemeProvider();
 
diff --git a/ui/base/touch/touch_device.h b/ui/base/touch/touch_device.h
index b06c564..099f6ef 100644
--- a/ui/base/touch/touch_device.h
+++ b/ui/base/touch/touch_device.h
@@ -5,7 +5,7 @@
 #ifndef UI_BASE_TOUCH_TOUCH_DEVICE_H_
 #define UI_BASE_TOUCH_TOUCH_DEVICE_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
@@ -15,7 +15,7 @@ namespace ui {
 const int kMaxTouchPointsUnknown = -1;
 
 // Returns true if a touch device is available.
-UI_EXPORT bool IsTouchDevicePresent();
+UI_BASE_EXPORT bool IsTouchDevicePresent();
 
 // Returns the maximum number of simultaneous touch contacts supported
 // by the device. In the case of devices with multiple digitizers (e.g.
@@ -24,7 +24,7 @@ UI_EXPORT bool IsTouchDevicePresent();
 // For example, suppose a device has 3 touchscreens, which support 2, 5,
 // and 10 simultaneous touch contacts, respectively. This returns 10.
 // http://www.w3.org/TR/pointerevents/#widl-Navigator-maxTouchPoints
-UI_EXPORT int MaxTouchPoints();
+UI_BASE_EXPORT int MaxTouchPoints();
 
 }  // namespace ui
 
diff --git a/ui/base/touch/touch_editing_controller.h b/ui/base/touch/touch_editing_controller.h
index 2c94f0a..58bcb45 100644
--- a/ui/base/touch/touch_editing_controller.h
+++ b/ui/base/touch/touch_editing_controller.h
@@ -13,7 +13,7 @@ namespace ui {
 
 // An interface implemented by widget that has text that can be selected/edited
 // using touch.
-class UI_EXPORT TouchEditable : public ui::SimpleMenuModel::Delegate {
+class UI_BASE_EXPORT TouchEditable : public ui::SimpleMenuModel::Delegate {
  public:
   // Select everything between start and end (points are in view's local
   // coordinate system). |start| is the logical start and |end| is the logical
@@ -57,7 +57,7 @@ class UI_EXPORT TouchEditable : public ui::SimpleMenuModel::Delegate {
 
 // This defines the callback interface for other code to be notified of changes
 // in the state of a TouchEditable.
-class UI_EXPORT TouchSelectionController {
+class UI_BASE_EXPORT TouchSelectionController {
  public:
   virtual ~TouchSelectionController() {}
 
@@ -72,7 +72,7 @@ class UI_EXPORT TouchSelectionController {
   virtual bool IsHandleDragInProgress() = 0;
 };
 
-class UI_EXPORT TouchSelectionControllerFactory {
+class UI_BASE_EXPORT TouchSelectionControllerFactory {
  public:
   static void SetInstance(TouchSelectionControllerFactory* instance);
 
diff --git a/ui/base/touch/touch_enabled.h b/ui/base/touch/touch_enabled.h
index 4155674..88837d7 100644
--- a/ui/base/touch/touch_enabled.h
+++ b/ui/base/touch/touch_enabled.h
@@ -5,13 +5,13 @@
 #ifndef UI_BASE_TOUCH_TOUCH_ENABLED_H_
 #define UI_BASE_TOUCH_TOUCH_ENABLED_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
 // Returns true if the touch-enabled flag is enabled, or if it is set to auto
 // and a touch device is present.
-UI_EXPORT bool AreTouchEventsEnabled();
+UI_BASE_EXPORT bool AreTouchEventsEnabled();
 
 }  // namespace ui
 
diff --git a/ui/base/ui_base_export.h b/ui/base/ui_base_export.h
new file mode 100644
index 0000000..dba9b89
--- /dev/null
+++ b/ui/base/ui_base_export.h
@@ -0,0 +1,37 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef UI_BASE_UI_BASE_EXPORT_H_
+#define UI_BASE_UI_BASE_EXPORT_H_
+
+// Defines UI_BASE_EXPORT so that functionality implemented by the UI module
+// can be exported to consumers.
+
+#if defined(COMPONENT_BUILD)
+
+#if defined(WIN32)
+
+#if defined(UI_BASE_IMPLEMENTATION)
+#define UI_BASE_EXPORT __declspec(dllexport)
+#else
+#define UI_BASE_EXPORT __declspec(dllimport)
+#endif
+
+#else  // !defined(WIN32)
+
+#if defined(UI_BASE_IMPLEMENTATION)
+#define UI_BASE_EXPORT __attribute__((visibility("default")))
+#else
+#define UI_BASE_EXPORT
+#endif
+
+#endif
+
+#else  // !defined(COMPONENT_BUILD)
+
+#define UI_BASE_EXPORT
+
+#endif
+
+#endif  // UI_BASE_UI_BASE_EXPORT_H_
diff --git a/ui/base/ui_base_paths.h b/ui/base/ui_base_paths.h
index 2b61723..cd2c230 100644
--- a/ui/base/ui_base_paths.h
+++ b/ui/base/ui_base_paths.h
@@ -6,7 +6,7 @@
 #define UI_BASE_UI_BASE_PATHS_H_
 
 #include "build/build_config.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 // This file declares path keys for the app module.  These can be used with
 // the PathService to access various special directories and files.
@@ -29,7 +29,7 @@ enum {
 };
 
 // Call once to register the provider for the path keys defined above.
-UI_EXPORT void RegisterPathProvider();
+UI_BASE_EXPORT void RegisterPathProvider();
 
 }  // namespace ui
 
diff --git a/ui/base/ui_base_switches.h b/ui/base/ui_base_switches.h
index 4e1b7e0..3937de7 100644
--- a/ui/base/ui_base_switches.h
+++ b/ui/base/ui_base_switches.h
@@ -8,32 +8,32 @@
 #define UI_BASE_UI_BASE_SWITCHES_H_
 
 #include "base/compiler_specific.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace switches {
 
-UI_EXPORT extern const char kDisableDwmComposition[];
-UI_EXPORT extern const char kDisableTouchAdjustment[];
-UI_EXPORT extern const char kDisableTouchDragDrop[];
-UI_EXPORT extern const char kDisableTouchEditing[];
-UI_EXPORT extern const char kEnableTouchDragDrop[];
-UI_EXPORT extern const char kEnableTouchEditing[];
-UI_EXPORT extern const char kHighlightMissingScaledResources[];
-UI_EXPORT extern const char kLang[];
-UI_EXPORT extern const char kLocalePak[];
-UI_EXPORT extern const char kNoMessageBox[];
-UI_EXPORT extern const char kTouchOptimizedUI[];
-UI_EXPORT extern const char kTouchOptimizedUIAuto[];
-UI_EXPORT extern const char kTouchOptimizedUIDisabled[];
-UI_EXPORT extern const char kTouchOptimizedUIEnabled[];
-UI_EXPORT extern const char kTouchSideBezels[];
+UI_BASE_EXPORT extern const char kDisableDwmComposition[];
+UI_BASE_EXPORT extern const char kDisableTouchAdjustment[];
+UI_BASE_EXPORT extern const char kDisableTouchDragDrop[];
+UI_BASE_EXPORT extern const char kDisableTouchEditing[];
+UI_BASE_EXPORT extern const char kEnableTouchDragDrop[];
+UI_BASE_EXPORT extern const char kEnableTouchEditing[];
+UI_BASE_EXPORT extern const char kHighlightMissingScaledResources[];
+UI_BASE_EXPORT extern const char kLang[];
+UI_BASE_EXPORT extern const char kLocalePak[];
+UI_BASE_EXPORT extern const char kNoMessageBox[];
+UI_BASE_EXPORT extern const char kTouchOptimizedUI[];
+UI_BASE_EXPORT extern const char kTouchOptimizedUIAuto[];
+UI_BASE_EXPORT extern const char kTouchOptimizedUIDisabled[];
+UI_BASE_EXPORT extern const char kTouchOptimizedUIEnabled[];
+UI_BASE_EXPORT extern const char kTouchSideBezels[];
 
 #if defined(OS_ANDROID)
-UI_EXPORT extern const char kTabletUI[];
+UI_BASE_EXPORT extern const char kTabletUI[];
 #endif
 
 #if defined(USE_XI2_MT)
-UI_EXPORT extern const char kTouchCalibration[];
+UI_BASE_EXPORT extern const char kTouchCalibration[];
 #endif
 
 }  // namespace switches
diff --git a/ui/base/ui_base_switches_util.h b/ui/base/ui_base_switches_util.h
index c64da8f..92badcc 100644
--- a/ui/base/ui_base_switches_util.h
+++ b/ui/base/ui_base_switches_util.h
@@ -6,12 +6,12 @@
 #define UI_BASE_UI_BASE_SWITCHES_UTIL_H_
 
 #include "base/compiler_specific.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace switches {
 
-UI_EXPORT bool IsTouchDragDropEnabled();
-UI_EXPORT bool IsTouchEditingEnabled();
+UI_BASE_EXPORT bool IsTouchDragDropEnabled();
+UI_BASE_EXPORT bool IsTouchEditingEnabled();
 
 }  // namespace switches
 
diff --git a/ui/base/ui_base_types.h b/ui/base/ui_base_types.h
index 3b8ee9c..ff0e234 100644
--- a/ui/base/ui_base_types.h
+++ b/ui/base/ui_base_types.h
@@ -5,7 +5,7 @@
 #ifndef UI_BASE_UI_BASE_TYPES_H_
 #define UI_BASE_UI_BASE_TYPES_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
@@ -50,7 +50,7 @@ enum MenuSourceType {
   MENU_SOURCE_TOUCH_EDIT_MENU = 4,
 };
 
-UI_EXPORT MenuSourceType GetMenuSourceTypeForEvent(const ui::Event& event);
+UI_BASE_EXPORT MenuSourceType GetMenuSourceTypeForEvent(const ui::Event& event);
 
 }  // namespace ui
 
diff --git a/ui/base/ui_export.h b/ui/base/ui_export.h
deleted file mode 100644
index ba05e33..0000000
--- a/ui/base/ui_export.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef UI_UI_EXPORT_H_
-#define UI_UI_EXPORT_H_
-
-// Defines UI_EXPORT so that functionality implemented by the UI module can be
-// exported to consumers.
-
-#if defined(COMPONENT_BUILD)
-#if defined(WIN32)
-
-#if defined(UI_IMPLEMENTATION)
-#define UI_EXPORT __declspec(dllexport)
-#else
-#define UI_EXPORT __declspec(dllimport)
-#endif  // defined(UI_IMPLEMENTATION)
-
-#else  // defined(WIN32)
-#if defined(UI_IMPLEMENTATION)
-#define UI_EXPORT __attribute__((visibility("default")))
-#else
-#define UI_EXPORT
-#endif
-#endif
-
-#else  // defined(COMPONENT_BUILD)
-#define UI_EXPORT
-#endif
-
-#endif  // UI_UI_EXPORT_H_
diff --git a/ui/base/view_prop.h b/ui/base/view_prop.h
index eae6792..789cd46e 100644
--- a/ui/base/view_prop.h
+++ b/ui/base/view_prop.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(USE_AURA))
@@ -20,7 +20,7 @@ namespace ui {
 // designed as a replacement for the Win32's SetProp, but does not make use of
 // window manager memory. ViewProp shares similar semantics as SetProp, the
 // value for a particular view/key pair comes from the last ViewProp created.
-class UI_EXPORT ViewProp {
+class UI_BASE_EXPORT ViewProp {
  public:
   // Associates data with a view/key pair. If a ViewProp has already been
   // created for the specified pair |data| replaces the current value.
diff --git a/ui/base/webui/jstemplate_builder.h b/ui/base/webui/jstemplate_builder.h
index 66b265a..1ad15c3 100644
--- a/ui/base/webui/jstemplate_builder.h
+++ b/ui/base/webui/jstemplate_builder.h
@@ -16,7 +16,7 @@
 #include <string>
 
 #include "base/strings/string_piece.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace base {
 class DictionaryValue;
@@ -27,7 +27,7 @@ namespace webui {
 // While an object of this class is in scope, the template builder will output
 // version 2 html. Version 2 uses load_time_data.js and i18n_template2.js, and
 // should soon become the default.
-class UI_EXPORT UseVersion2 {
+class UI_BASE_EXPORT UseVersion2 {
  public:
   UseVersion2();
   ~UseVersion2();
@@ -39,52 +39,55 @@ class UI_EXPORT UseVersion2 {
 // A helper function that generates a string of HTML to be loaded.  The
 // string includes the HTML and the javascript code necessary to generate the
 // full page with support for JsTemplates.
-UI_EXPORT std::string GetTemplateHtml(const base::StringPiece& html_template,
-                                      const base::DictionaryValue* json,
-                                      const base::StringPiece& template_id);
+UI_BASE_EXPORT std::string GetTemplateHtml(
+    const base::StringPiece& html_template,
+    const base::DictionaryValue* json,
+    const base::StringPiece& template_id);
 
 // A helper function that generates a string of HTML to be loaded.  The
 // string includes the HTML and the javascript code necessary to generate the
 // full page with support for i18n Templates.
-UI_EXPORT std::string GetI18nTemplateHtml(
+UI_BASE_EXPORT std::string GetI18nTemplateHtml(
     const base::StringPiece& html_template,
     const base::DictionaryValue* json);
 
 // A helper function that generates a string of HTML to be loaded.  The
 // string includes the HTML and the javascript code necessary to generate the
 // full page with support for both i18n Templates and JsTemplates.
-UI_EXPORT std::string GetTemplatesHtml(const base::StringPiece& html_template,
-                                       const base::DictionaryValue* json,
-                                       const base::StringPiece& template_id);
+UI_BASE_EXPORT std::string GetTemplatesHtml(
+    const base::StringPiece& html_template,
+    const base::DictionaryValue* json,
+    const base::StringPiece& template_id);
 
 // The following functions build up the different parts that the above
 // templates use.
 
 // Appends a script tag with a variable name |templateData| that has the JSON
 // assigned to it.
-UI_EXPORT void AppendJsonHtml(const base::DictionaryValue* json,
-                              std::string* output);
+UI_BASE_EXPORT void AppendJsonHtml(const base::DictionaryValue* json,
+                                   std::string* output);
 
 // Same as AppendJsonHtml(), except does not include the <script></script>
 // tag wrappers.
-UI_EXPORT void AppendJsonJS(const base::DictionaryValue* json,
-                            std::string* output);
+UI_BASE_EXPORT void AppendJsonJS(const base::DictionaryValue* json,
+                                 std::string* output);
 
 // Appends the source for JsTemplates in a script tag.
-UI_EXPORT void AppendJsTemplateSourceHtml(std::string* output);
+UI_BASE_EXPORT void AppendJsTemplateSourceHtml(std::string* output);
 
 // Appends the code that processes the JsTemplate with the JSON. You should
 // call AppendJsTemplateSourceHtml and AppendJsonHtml before calling this.
-UI_EXPORT void AppendJsTemplateProcessHtml(const base::StringPiece& template_id,
-                                           std::string* output);
+UI_BASE_EXPORT void AppendJsTemplateProcessHtml(
+    const base::StringPiece& template_id,
+    std::string* output);
 
 // Appends the source for i18n Templates in a script tag.
-UI_EXPORT void AppendI18nTemplateSourceHtml(std::string* output);
+UI_BASE_EXPORT void AppendI18nTemplateSourceHtml(std::string* output);
 
 // Appends the code that processes the i18n Template with the JSON. You
 // should call AppendJsTemplateSourceHtml and AppendJsonHtml before calling
 // this.
-UI_EXPORT void AppendI18nTemplateProcessHtml(std::string* output);
+UI_BASE_EXPORT void AppendI18nTemplateProcessHtml(std::string* output);
 
 }  // namespace webui
 
diff --git a/ui/base/webui/web_ui_util.h b/ui/base/webui/web_ui_util.h
index 72afec6..3e55fce 100644
--- a/ui/base/webui/web_ui_util.h
+++ b/ui/base/webui/web_ui_util.h
@@ -10,7 +10,7 @@
 #include "base/strings/string_piece.h"
 #include "base/values.h"
 #include "ui/base/layout.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/base/window_open_disposition.h"
 
 class GURL;
@@ -20,7 +20,7 @@ namespace webui {
 
 // Convenience routine to convert SkBitmap object to data url
 // so that it can be used in WebUI.
-UI_EXPORT std::string GetBitmapDataUrl(const SkBitmap& bitmap);
+UI_BASE_EXPORT std::string GetBitmapDataUrl(const SkBitmap& bitmap);
 
 // Convenience routine to get data url that corresponds to given
 // resource_id as a bitmap. This function does not check if the
@@ -28,31 +28,30 @@ UI_EXPORT std::string GetBitmapDataUrl(const SkBitmap& bitmap);
 // caller's responsibility to make sure the resource is indeed a
 // bitmap. Returns empty string if a resource does not exist for given
 // |resource_id|.
-UI_EXPORT std::string GetBitmapDataUrlFromResource(int resource_id);
+UI_BASE_EXPORT std::string GetBitmapDataUrlFromResource(int resource_id);
 
 // Extracts a disposition from click event arguments. |args| should contain
 // an integer button and booleans alt key, ctrl key, meta key, and shift key
 // (in that order), starting at |start_index|.
-UI_EXPORT WindowOpenDisposition GetDispositionFromClick(
-    const base::ListValue* args,
-    int start_index);
+UI_BASE_EXPORT WindowOpenDisposition
+    GetDispositionFromClick(const base::ListValue* args, int start_index);
 
 // Given a scale factor such as "1x", "2x" or "1.99x", sets |scale_factor| to
 // the closest ScaleFactor enum value for this scale factor. If string can not
 // be parsed, then |scale_factor| is set to SCALE_FACTOR_100P, and false is
 // returned.
-UI_EXPORT bool ParseScaleFactor(const base::StringPiece&identifier,
-                                ui::ScaleFactor* scale_factor);
+UI_BASE_EXPORT bool ParseScaleFactor(const base::StringPiece& identifier,
+                                     ui::ScaleFactor* scale_factor);
 
 // Parses a URL containing some path @{scale}x. If it does not contain a scale
 // factor then the default scale factor is returned.
-UI_EXPORT void ParsePathAndScale(const GURL& url,
-                                 std::string* path,
-                                 ui::ScaleFactor* scale_factor);
+UI_BASE_EXPORT void ParsePathAndScale(const GURL& url,
+                                      std::string* path,
+                                      ui::ScaleFactor* scale_factor);
 
 // Helper function to set the font family, size, and text direction into the
 // given dictionary.
-UI_EXPORT void SetFontAndTextDirection(
+UI_BASE_EXPORT void SetFontAndTextDirection(
     base::DictionaryValue* localized_strings);
 
 }  // namespace webui
diff --git a/ui/base/win/accessibility_misc_utils.h b/ui/base/win/accessibility_misc_utils.h
index 3789efb..cc6b17e 100644
--- a/ui/base/win/accessibility_misc_utils.h
+++ b/ui/base/win/accessibility_misc_utils.h
@@ -9,13 +9,13 @@
 #include <UIAutomationCore.h>
 
 #include "base/compiler_specific.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace base {
 namespace win {
 
   // UIA Text provider implementation for edit controls.
-class UI_EXPORT UIATextProvider
+class UI_BASE_EXPORT UIATextProvider
     : public NON_EXPORTED_BASE(CComObjectRootEx<CComMultiThreadModel>),
       public IValueProvider,
       public ITextProvider {
diff --git a/ui/base/win/dpi_setup.h b/ui/base/win/dpi_setup.h
index a885849..5837153 100644
--- a/ui/base/win/dpi_setup.h
+++ b/ui/base/win/dpi_setup.h
@@ -5,7 +5,7 @@
 #ifndef UI_BASE_WIN_DPI_SETUP_H_
 #define UI_BASE_WIN_DPI_SETUP_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 namespace win {
@@ -14,7 +14,7 @@ namespace win {
 // the best available scale based on the screen's pixel density. This can be
 // affected (overridden) by --force-device-scale-factor=x
 // This function can be called only once for the lifetime of a process.
-UI_EXPORT void InitDeviceScaleFactor();
+UI_BASE_EXPORT void InitDeviceScaleFactor();
 
 }  // namespace win
 }  // namespace ui
diff --git a/ui/base/win/foreground_helper.h b/ui/base/win/foreground_helper.h
index a2d9ea2..73c9f63 100644
--- a/ui/base/win/foreground_helper.h
+++ b/ui/base/win/foreground_helper.h
@@ -6,7 +6,7 @@
 #define UI_BASE_WIN_FOREGROUND_HELPER_H_
 
 #include "base/logging.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/win/window_impl.h"
 
 namespace ui {
@@ -18,7 +18,7 @@ namespace ui {
 // to be capable of moving to the foreground.
 //
 // This is probably leveraging a windows bug.
-class UI_EXPORT ForegroundHelper : public gfx::WindowImpl {
+class UI_BASE_EXPORT ForegroundHelper : public gfx::WindowImpl {
  public:
   ForegroundHelper() : window_(NULL) { }
 
diff --git a/ui/base/win/hidden_window.h b/ui/base/win/hidden_window.h
index e3189a6..6cc2fd0 100644
--- a/ui/base/win/hidden_window.h
+++ b/ui/base/win/hidden_window.h
@@ -7,13 +7,13 @@
 
 #include <windows.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
 // Returns an HWND that can be used as a temporary parent. The returned HWND is
 // never destroyed.
-UI_EXPORT HWND GetHiddenWindow();
+UI_BASE_EXPORT HWND GetHiddenWindow();
 
 }  // namespace ui
 
diff --git a/ui/base/win/hwnd_subclass.h b/ui/base/win/hwnd_subclass.h
index 834a45a..0a371cb 100644
--- a/ui/base/win/hwnd_subclass.h
+++ b/ui/base/win/hwnd_subclass.h
@@ -5,19 +5,19 @@
 #ifndef UI_BASE_WIN_HWND_SUBCLASS_H_
 #define UI_BASE_WIN_HWND_SUBCLASS_H_
 
-#include <vector>
 #include <windows.h>
+#include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/base/view_prop.h"
 
 namespace ui {
 
 // Classes implementing this interface get the opportunity to handle and consume
 // messages before they are sent to their target HWND.
-class UI_EXPORT HWNDMessageFilter {
+class UI_BASE_EXPORT HWNDMessageFilter {
  public:
   virtual ~HWNDMessageFilter();
 
@@ -38,7 +38,7 @@ class UI_EXPORT HWNDMessageFilter {
 
 // An object that instance-subclasses a window. If the window has already been
 // instance-subclassed, that subclassing is lost.
-class UI_EXPORT HWNDSubclass {
+class UI_BASE_EXPORT HWNDSubclass {
  public:
   ~HWNDSubclass();
 
diff --git a/ui/base/win/message_box_win.h b/ui/base/win/message_box_win.h
index f24150e..f48bec3 100644
--- a/ui/base/win/message_box_win.h
+++ b/ui/base/win/message_box_win.h
@@ -8,7 +8,7 @@
 #include <windows.h>
 
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
@@ -16,10 +16,10 @@ namespace ui {
 // MessageBox function allows us to control certain RTL locale flags so that
 // callers don't have to worry about adding these flags when running in a
 // right-to-left locale.
-UI_EXPORT int MessageBox(HWND hwnd,
-                         const base::string16& text,
-                         const base::string16& caption,
-                         UINT flags);
+UI_BASE_EXPORT int MessageBox(HWND hwnd,
+                              const base::string16& text,
+                              const base::string16& caption,
+                              UINT flags);
 
 }  // namespace ui
 
diff --git a/ui/base/win/mouse_wheel_util.h b/ui/base/win/mouse_wheel_util.h
index d6266d7..b9f5872 100644
--- a/ui/base/win/mouse_wheel_util.h
+++ b/ui/base/win/mouse_wheel_util.h
@@ -7,7 +7,7 @@
 
 #include <windows.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
@@ -17,7 +17,7 @@ class ViewProp;
 // We reroute the mouse wheel messages to such HWND when they are under the
 // mouse pointer (but are not the active window). Callers own the returned
 // object.
-UI_EXPORT ViewProp* SetWindowSupportsRerouteMouseWheel(HWND hwnd);
+UI_BASE_EXPORT ViewProp* SetWindowSupportsRerouteMouseWheel(HWND hwnd);
 
 // Forwards mouse wheel messages to the window under it.
 // Windows sends mouse wheel messages to the currently active window.
@@ -26,8 +26,9 @@ UI_EXPORT ViewProp* SetWindowSupportsRerouteMouseWheel(HWND hwnd);
 // mouse wheel in order to scroll that window. This is arguably a better user
 // experience.  The returns value says whether the mouse wheel message was
 // successfully redirected.
-UI_EXPORT bool RerouteMouseWheel(HWND window, WPARAM w_param,
-                                 LPARAM l_param);
+UI_BASE_EXPORT bool RerouteMouseWheel(HWND window,
+                                      WPARAM w_param,
+                                      LPARAM l_param);
 
 }  // namespace ui
 
diff --git a/ui/base/win/scoped_ole_initializer.h b/ui/base/win/scoped_ole_initializer.h
index 6b115f9..b2e81d2 100644
--- a/ui/base/win/scoped_ole_initializer.h
+++ b/ui/base/win/scoped_ole_initializer.h
@@ -8,11 +8,11 @@
 #include <ole2.h>
 
 #include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
-class UI_EXPORT ScopedOleInitializer {
+class UI_BASE_EXPORT ScopedOleInitializer {
  public:
   ScopedOleInitializer();
   ~ScopedOleInitializer();
diff --git a/ui/base/win/shell.h b/ui/base/win/shell.h
index 82f828f..e732abf 100644
--- a/ui/base/win/shell.h
+++ b/ui/base/win/shell.h
@@ -8,7 +8,7 @@
 #include <windows.h>
 
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace base {
 class FilePath;
@@ -21,21 +21,22 @@ namespace win {
 // default application registered for the file specified by 'full_path',
 // ask the user, via the Windows "Open With" dialog.
 // Returns 'true' on successful open, 'false' otherwise.
-UI_EXPORT bool OpenItemViaShell(const base::FilePath& full_path);
+UI_BASE_EXPORT bool OpenItemViaShell(const base::FilePath& full_path);
 
 // The download manager now writes the alternate data stream with the
 // zone on all downloads. This function is equivalent to OpenItemViaShell
 // without showing the zone warning dialog.
-UI_EXPORT bool OpenItemViaShellNoZoneCheck(const base::FilePath& full_path);
+UI_BASE_EXPORT bool OpenItemViaShellNoZoneCheck(
+    const base::FilePath& full_path);
 
 // Lower level function that allows opening of non-files like urls or GUIDs
 // don't use it if one of the above will do. |mask| is a valid combination
 // of SEE_MASK_FLAG_XXX as stated in msdn. If there is no default application
 // registered for the item, it behaves the same as OpenItemViaShell.
-UI_EXPORT bool OpenAnyViaShell(const base::string16& full_path,
-                               const base::string16& directory,
-                               const base::string16& args,
-                               DWORD mask);
+UI_BASE_EXPORT bool OpenAnyViaShell(const base::string16& full_path,
+                                    const base::string16& directory,
+                                    const base::string16& args,
+                                    DWORD mask);
 
 // Ask the user, via the Windows "Open With" dialog, for an application to use
 // to open the file specified by 'full_path'.
@@ -45,11 +46,11 @@ bool OpenItemWithExternalApp(const base::string16& full_path);
 // Disables the ability of the specified window to be pinned to the taskbar or
 // the Start menu. This will remove "Pin this program to taskbar" from the
 // taskbar menu of the specified window.
-UI_EXPORT bool PreventWindowFromPinning(HWND hwnd);
+UI_BASE_EXPORT bool PreventWindowFromPinning(HWND hwnd);
 
 // Sets the application id, app icon, relaunch command and relaunch display name
 // for the given window.
-UI_EXPORT void SetAppDetailsForWindow(
+UI_BASE_EXPORT void SetAppDetailsForWindow(
     const base::string16& app_id,
     const base::string16& app_icon,
     const base::string16& relaunch_command,
@@ -59,22 +60,23 @@ UI_EXPORT void SetAppDetailsForWindow(
 // Sets the application id given as the Application Model ID for the window
 // specified.  This method is used to insure that different web applications
 // do not group together on the Win7 task bar.
-UI_EXPORT void SetAppIdForWindow(const base::string16& app_id, HWND hwnd);
+UI_BASE_EXPORT void SetAppIdForWindow(const base::string16& app_id, HWND hwnd);
 
 // Sets the application icon for the window specified.
-UI_EXPORT void SetAppIconForWindow(const base::string16& app_icon, HWND hwnd);
+UI_BASE_EXPORT void SetAppIconForWindow(const base::string16& app_icon,
+                                        HWND hwnd);
 
 // Sets the relaunch command and relaunch display name for the window specified.
 // Windows will use this information for grouping on the taskbar, and to create
 // a shortcut if the window is pinned to the taskbar.
-UI_EXPORT void SetRelaunchDetailsForWindow(
+UI_BASE_EXPORT void SetRelaunchDetailsForWindow(
     const base::string16& relaunch_command,
     const base::string16& display_name,
     HWND hwnd);
 
 // Returns true if composition is available and turned on on the current
 // platform.
-UI_EXPORT bool IsAeroGlassEnabled();
+UI_BASE_EXPORT bool IsAeroGlassEnabled();
 
 }  // namespace win
 }  // namespace ui
diff --git a/ui/base/win/touch_input.cc b/ui/base/win/touch_input.cc
index a369ab1..0114bdd 100644
--- a/ui/base/win/touch_input.cc
+++ b/ui/base/win/touch_input.cc
@@ -6,10 +6,10 @@
 
 namespace ui {
 
-UI_EXPORT BOOL GetTouchInputInfoWrapper(HTOUCHINPUT handle,
-                                        UINT count,
-                                        PTOUCHINPUT pointer,
-                                        int size) {
+BOOL GetTouchInputInfoWrapper(HTOUCHINPUT handle,
+                              UINT count,
+                              PTOUCHINPUT pointer,
+                              int size) {
   typedef BOOL(WINAPI *GetTouchInputInfoPtr)(HTOUCHINPUT, UINT,
                                              PTOUCHINPUT, int);
   static GetTouchInputInfoPtr get_touch_input_info_func =
diff --git a/ui/base/win/touch_input.h b/ui/base/win/touch_input.h
index dd0d829..f113ec5 100644
--- a/ui/base/win/touch_input.h
+++ b/ui/base/win/touch_input.h
@@ -7,16 +7,16 @@
 
 #include <windows.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
 // Wrapper for GetTouchInputInfo, which is not defined before Win7. For
 // earlier OS's, this function returns FALSE.
-UI_EXPORT BOOL GetTouchInputInfoWrapper(HTOUCHINPUT handle,
-                                        UINT count,
-                                        PTOUCHINPUT pointer,
-                                        int size);
+UI_BASE_EXPORT BOOL GetTouchInputInfoWrapper(HTOUCHINPUT handle,
+                                             UINT count,
+                                             PTOUCHINPUT pointer,
+                                             int size);
 
 }  // namespace ui
 
diff --git a/ui/base/window_open_disposition.h b/ui/base/window_open_disposition.h
index 8d96629..fe96aac 100644
--- a/ui/base/window_open_disposition.h
+++ b/ui/base/window_open_disposition.h
@@ -5,7 +5,7 @@
 #ifndef UI_BASE_WINDOW_OPEN_DISPOSITION_H_
 #define UI_BASE_WINDOW_OPEN_DISPOSITION_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 enum WindowOpenDisposition {
 
@@ -20,16 +20,16 @@ namespace ui {
 // Translates event flags from a click on a link into the user's desired
 // window disposition.  For example, a middle click would mean to open
 // a background tab.
-UI_EXPORT WindowOpenDisposition DispositionFromClick(bool middle_button,
-                                                     bool alt_key,
-                                                     bool ctrl_key,
-                                                     bool meta_key,
-                                                     bool shift_key);
+UI_BASE_EXPORT WindowOpenDisposition DispositionFromClick(bool middle_button,
+                                                          bool alt_key,
+                                                          bool ctrl_key,
+                                                          bool meta_key,
+                                                          bool shift_key);
 
 // Translates event flags into what kind of disposition they represents.
 // For example, a middle click would mean to open a background tab.
 // event_flags are the flags as understood by ui::MouseEvent.
-UI_EXPORT WindowOpenDisposition DispositionFromEventFlags(int event_flags);
+UI_BASE_EXPORT WindowOpenDisposition DispositionFromEventFlags(int event_flags);
 
 }  // namespace ui
 
diff --git a/ui/base/work_area_watcher_observer.h b/ui/base/work_area_watcher_observer.h
index 63fbf87..341eda0 100644
--- a/ui/base/work_area_watcher_observer.h
+++ b/ui/base/work_area_watcher_observer.h
@@ -5,14 +5,14 @@
 #ifndef UI_BASE_WORK_AREA_WATCHER_OBSERVER_H_
 #define UI_BASE_WORK_AREA_WATCHER_OBSERVER_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
 // This interface should be implemented by classes that want to be notified
 // when the work area has changed due to something like screen resolution or
 // taskbar changes.
-class UI_EXPORT WorkAreaWatcherObserver {
+class UI_BASE_EXPORT WorkAreaWatcherObserver {
  public:
   virtual void WorkAreaChanged() = 0;
 
diff --git a/ui/base/x/active_window_watcher_x.h b/ui/base/x/active_window_watcher_x.h
index 9e0ae13..01f70f4 100644
--- a/ui/base/x/active_window_watcher_x.h
+++ b/ui/base/x/active_window_watcher_x.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/base/x/x11_util.h"
 
 template <typename T> struct DefaultSingletonTraits;
@@ -23,7 +23,7 @@ class RootWindowPropertyWatcherX;
 // This is a helper class that is used to keep track of which window the X
 // window manager thinks is active. Add an Observer to listen for changes to
 // the active window.
-class UI_EXPORT ActiveWindowWatcherX {
+class UI_BASE_EXPORT ActiveWindowWatcherX {
  public:
   static ActiveWindowWatcherX* GetInstance();
   static void AddObserver(ActiveWindowWatcherXObserver* observer);
diff --git a/ui/base/x/active_window_watcher_x_observer.h b/ui/base/x/active_window_watcher_x_observer.h
index e4c71ea..4634f91 100644
--- a/ui/base/x/active_window_watcher_x_observer.h
+++ b/ui/base/x/active_window_watcher_x_observer.h
@@ -7,11 +7,11 @@
 
 #include <gdk/gdk.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
-class UI_EXPORT ActiveWindowWatcherXObserver {
+class UI_BASE_EXPORT ActiveWindowWatcherXObserver {
  public:
   // |active_window| will be NULL if the active window isn't one of Chrome's.
   virtual void ActiveWindowChanged(GdkWindow* active_window) = 0;
diff --git a/ui/base/x/selection_owner.h b/ui/base/x/selection_owner.h
index 8cecc62..6267125 100644
--- a/ui/base/x/selection_owner.h
+++ b/ui/base/x/selection_owner.h
@@ -14,7 +14,7 @@
 
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/base/x/selection_utils.h"
 #include "ui/gfx/x/x11_atom_cache.h"
 
@@ -25,7 +25,7 @@ namespace ui {
 // The selection owner object keeps track of which xwindow is the current
 // owner, and when its |xwindow_|, offers different data types to other
 // processes.
-class UI_EXPORT SelectionOwner {
+class UI_BASE_EXPORT SelectionOwner {
  public:
   SelectionOwner(Display* xdisplay,
                  ::Window xwindow,
diff --git a/ui/base/x/selection_requestor.h b/ui/base/x/selection_requestor.h
index c045255..333d308 100644
--- a/ui/base/x/selection_requestor.h
+++ b/ui/base/x/selection_requestor.h
@@ -16,7 +16,7 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted_memory.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/x/x11_atom_cache.h"
 
 namespace ui {
@@ -29,7 +29,7 @@ class SelectionData;
 // drop. This class interprets messages from the statefull selection request
 // API. SelectionRequestor should only deal with the X11 details; it does not
 // implement per-component fast-paths.
-class UI_EXPORT SelectionRequestor {
+class UI_BASE_EXPORT SelectionRequestor {
  public:
   SelectionRequestor(Display* xdisplay,
                      ::Window xwindow,
diff --git a/ui/base/x/selection_utils.h b/ui/base/x/selection_utils.h
index 9770938..7976beb 100644
--- a/ui/base/x/selection_utils.h
+++ b/ui/base/x/selection_utils.h
@@ -15,7 +15,7 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted_memory.h"
 #include "ui/base/clipboard/clipboard.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/gfx/x/x11_atom_cache.h"
 
 namespace ui {
@@ -28,30 +28,32 @@ extern const char kText[];
 extern const char kUtf8String[];
 
 // Returns a list of all text atoms that we handle.
-UI_EXPORT std::vector< ::Atom> GetTextAtomsFrom(const X11AtomCache* atom_cache);
+UI_BASE_EXPORT std::vector< ::Atom> GetTextAtomsFrom(
+    const X11AtomCache* atom_cache);
 
-UI_EXPORT std::vector< ::Atom> GetURLAtomsFrom(const X11AtomCache* atom_cache);
+UI_BASE_EXPORT std::vector< ::Atom> GetURLAtomsFrom(
+    const X11AtomCache* atom_cache);
 
 // Places the intersection of |desired| and |offered| into |output|.
-UI_EXPORT void GetAtomIntersection(const std::vector< ::Atom>& desired,
+UI_BASE_EXPORT void GetAtomIntersection(const std::vector< ::Atom>& desired,
                                    const std::vector< ::Atom>& offered,
                                    std::vector< ::Atom>* output);
 
 // Takes the raw bytes of the base::string16 and copies them into |bytes|.
-UI_EXPORT void AddString16ToVector(const base::string16& str,
+UI_BASE_EXPORT void AddString16ToVector(const base::string16& str,
                                    std::vector<unsigned char>* bytes);
 
-UI_EXPORT std::string RefCountedMemoryToString(
+UI_BASE_EXPORT std::string RefCountedMemoryToString(
     const scoped_refptr<base::RefCountedMemory>& memory);
 
-UI_EXPORT base::string16 RefCountedMemoryToString16(
+UI_BASE_EXPORT base::string16 RefCountedMemoryToString16(
     const scoped_refptr<base::RefCountedMemory>& memory);
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // Represents the selection in different data formats. Binary data passed in is
 // assumed to be allocated with new char[], and is owned by SelectionFormatMap.
-class UI_EXPORT SelectionFormatMap {
+class UI_BASE_EXPORT SelectionFormatMap {
  public:
   // Our internal data store, which we only expose through iterators.
   typedef std::map< ::Atom, scoped_refptr<base::RefCountedMemory> > InternalMap;
@@ -85,7 +87,7 @@ class UI_EXPORT SelectionFormatMap {
 ///////////////////////////////////////////////////////////////////////////////
 
 // A holder for data with optional X11 deletion semantics.
-class UI_EXPORT SelectionData {
+class UI_BASE_EXPORT SelectionData {
  public:
   // |atom_cache| is still owned by caller.
   SelectionData();
diff --git a/ui/base/x/work_area_watcher_x.h b/ui/base/x/work_area_watcher_x.h
index f888ea0..96cbcae 100644
--- a/ui/base/x/work_area_watcher_x.h
+++ b/ui/base/x/work_area_watcher_x.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/base/x/x11_util.h"
 
 template <typename T> struct DefaultSingletonTraits;
@@ -22,7 +22,7 @@ class RootWindowPropertyWatcherX;
 
 // This is a helper class that is used to keep track of changes to work area.
 // Add an observer to track changes.
-class UI_EXPORT WorkAreaWatcherX {
+class UI_BASE_EXPORT WorkAreaWatcherX {
  public:
   static WorkAreaWatcherX* GetInstance();
   static void AddObserver(WorkAreaWatcherObserver* observer);
diff --git a/ui/base/x/x11_util.h b/ui/base/x/x11_util.h
index 62aea96..92ad3f0 100644
--- a/ui/base/x/x11_util.h
+++ b/ui/base/x/x11_util.h
@@ -17,7 +17,7 @@
 #include "base/basictypes.h"
 #include "base/event_types.h"
 #include "base/memory/ref_counted_memory.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"
 #include "ui/gfx/point.h"
@@ -50,10 +50,10 @@ namespace ui {
 // These functions cache their results ---------------------------------
 
 // Check if there's an open connection to an X server.
-UI_EXPORT bool XDisplayExists();
+UI_BASE_EXPORT bool XDisplayExists();
 
 // Returns true if the system supports XINPUT2.
-UI_EXPORT bool IsXInput2Available();
+UI_BASE_EXPORT bool IsXInput2Available();
 
 // X shared memory comes in three flavors:
 // 1) No SHM support,
@@ -65,73 +65,73 @@ enum SharedMemorySupport {
   SHARED_MEMORY_PIXMAP
 };
 // Return the shared memory type of our X connection.
-UI_EXPORT SharedMemorySupport QuerySharedMemorySupport(XDisplay* dpy);
+UI_BASE_EXPORT SharedMemorySupport QuerySharedMemorySupport(XDisplay* dpy);
 
 // Return true iff the display supports Xrender
-UI_EXPORT bool QueryRenderSupport(XDisplay* dpy);
+UI_BASE_EXPORT bool QueryRenderSupport(XDisplay* dpy);
 
 // Return the default screen number for the display
 int GetDefaultScreen(XDisplay* display);
 
 // Returns an X11 Cursor, sharable across the process.
 // |cursor_shape| is an X font cursor shape, see XCreateFontCursor().
-UI_EXPORT ::Cursor GetXCursor(int cursor_shape);
+UI_BASE_EXPORT ::Cursor GetXCursor(int cursor_shape);
 
 // Resets the cache used by GetXCursor(). Only useful for tests that may delete
 // the display.
-UI_EXPORT void ResetXCursorCache();
+UI_BASE_EXPORT void ResetXCursorCache();
 
 #if defined(USE_AURA)
 // Creates a custom X cursor from the image. This takes ownership of image. The
 // caller must not free/modify the image. The refcount of the newly created
 // cursor is set to 1.
-UI_EXPORT ::Cursor CreateReffedCustomXCursor(XcursorImage* image);
+UI_BASE_EXPORT ::Cursor CreateReffedCustomXCursor(XcursorImage* image);
 
 // Increases the refcount of the custom cursor.
-UI_EXPORT void RefCustomXCursor(::Cursor cursor);
+UI_BASE_EXPORT void RefCustomXCursor(::Cursor cursor);
 
 // Decreases the refcount of the custom cursor, and destroys it if it reaches 0.
-UI_EXPORT void UnrefCustomXCursor(::Cursor cursor);
+UI_BASE_EXPORT void UnrefCustomXCursor(::Cursor cursor);
 
 // Creates a XcursorImage and copies the SkBitmap |bitmap| on it. |bitmap|
 // should be non-null. Caller owns the returned object.
-UI_EXPORT XcursorImage* SkBitmapToXcursorImage(const SkBitmap* bitmap,
-                                               const gfx::Point& hotspot);
+UI_BASE_EXPORT XcursorImage* SkBitmapToXcursorImage(const SkBitmap* bitmap,
+                                                    const gfx::Point& hotspot);
 
 // Coalesce all pending motion events (touch or mouse) that are at the top of
 // the queue, and return the number eliminated, storing the last one in
 // |last_event|.
-UI_EXPORT int CoalescePendingMotionEvents(const XEvent* xev,
-                                          XEvent* last_event);
+UI_BASE_EXPORT int CoalescePendingMotionEvents(const XEvent* xev,
+                                               XEvent* last_event);
 #endif
 
 // Hides the host cursor.
-UI_EXPORT void HideHostCursor();
+UI_BASE_EXPORT void HideHostCursor();
 
 // Returns an invisible cursor.
-UI_EXPORT ::Cursor CreateInvisibleCursor();
+UI_BASE_EXPORT ::Cursor CreateInvisibleCursor();
 
 // These functions do not cache their results --------------------------
 
 // Get the X window id for the default root window
-UI_EXPORT XID GetX11RootWindow();
+UI_BASE_EXPORT XID GetX11RootWindow();
 
 // Returns the user's current desktop.
 bool GetCurrentDesktop(int* desktop);
 
 #if defined(TOOLKIT_GTK)
 // Get the X window id for the given GTK widget.
-UI_EXPORT XID GetX11WindowFromGtkWidget(GtkWidget* widget);
+UI_BASE_EXPORT XID GetX11WindowFromGtkWidget(GtkWidget* widget);
 XID GetX11WindowFromGdkWindow(GdkWindow* window);
 
 // Get the GtkWindow* wrapping a given XID, if any.
 // Returns NULL if there isn't already a GtkWindow* wrapping this XID;
 // see gdk_window_foreign_new() etc. to wrap arbitrary XIDs.
-UI_EXPORT GtkWindow* GetGtkWindowFromX11Window(XID xid);
+UI_BASE_EXPORT GtkWindow* GetGtkWindowFromX11Window(XID xid);
 
 // Get a Visual from the given widget. Since we don't include the Xlib
 // headers, this is returned as a void*.
-UI_EXPORT void* GetVisualFromGtkWidget(GtkWidget* widget);
+UI_BASE_EXPORT void* GetVisualFromGtkWidget(GtkWidget* widget);
 #endif  // defined(TOOLKIT_GTK)
 
 enum HideTitlebarWhenMaximized {
@@ -139,28 +139,29 @@ enum HideTitlebarWhenMaximized {
   HIDE_TITLEBAR_WHEN_MAXIMIZED = 1,
 };
 // Sets _GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED on |window|.
-UI_EXPORT void SetHideTitlebarWhenMaximizedProperty(
+UI_BASE_EXPORT void SetHideTitlebarWhenMaximizedProperty(
     XID window,
     HideTitlebarWhenMaximized property);
 
 // Clears all regions of X11's default root window by filling black pixels.
-UI_EXPORT void ClearX11DefaultRootWindow();
+UI_BASE_EXPORT void ClearX11DefaultRootWindow();
 
 // Returns true if |window| is visible.
-UI_EXPORT bool IsWindowVisible(XID window);
+UI_BASE_EXPORT bool IsWindowVisible(XID window);
 
 // Returns the bounds of |window|.
-UI_EXPORT bool GetWindowRect(XID window, gfx::Rect* rect);
+UI_BASE_EXPORT bool GetWindowRect(XID window, gfx::Rect* rect);
 
 // Returns true if |window| contains the point |screen_loc|.
-UI_EXPORT bool WindowContainsPoint(XID window, gfx::Point screen_loc);
+UI_BASE_EXPORT bool WindowContainsPoint(XID window, gfx::Point screen_loc);
 
 // Return true if |window| has any property with |property_name|.
-UI_EXPORT bool PropertyExists(XID window, const std::string& property_name);
+UI_BASE_EXPORT bool PropertyExists(XID window,
+                                   const std::string& property_name);
 
 // Returns the raw bytes from a property with minimal
 // interpretation. |out_data| should be freed by XFree() after use.
-UI_EXPORT bool GetRawBytesOfProperty(
+UI_BASE_EXPORT bool GetRawBytesOfProperty(
     XID window,
     Atom property,
     scoped_refptr<base::RefCountedMemory>* out_data,
@@ -173,48 +174,52 @@ UI_EXPORT bool GetRawBytesOfProperty(
 //
 // TODO(erg): Once we remove the gtk port and are 100% aura, all of these
 // should accept an Atom instead of a string.
-UI_EXPORT bool GetIntProperty(XID window, const std::string& property_name,
-                              int* value);
-UI_EXPORT bool GetXIDProperty(XID window, const std::string& property_name,
-                              XID* value);
-UI_EXPORT bool GetIntArrayProperty(XID window, const std::string& property_name,
-                                   std::vector<int>* value);
-UI_EXPORT bool GetAtomArrayProperty(XID window,
-                                    const std::string& property_name,
-                                    std::vector<Atom>* value);
-UI_EXPORT bool GetStringProperty(
-    XID window, const std::string& property_name, std::string* value);
+UI_BASE_EXPORT bool GetIntProperty(XID window,
+                                   const std::string& property_name,
+                                   int* value);
+UI_BASE_EXPORT bool GetXIDProperty(XID window,
+                                   const std::string& property_name,
+                                   XID* value);
+UI_BASE_EXPORT bool GetIntArrayProperty(XID window,
+                                        const std::string& property_name,
+                                        std::vector<int>* value);
+UI_BASE_EXPORT bool GetAtomArrayProperty(XID window,
+                                         const std::string& property_name,
+                                         std::vector<Atom>* value);
+UI_BASE_EXPORT bool GetStringProperty(XID window,
+                                      const std::string& property_name,
+                                      std::string* value);
 
 // These setters all make round trips.
-UI_EXPORT bool SetIntProperty(XID window,
-                              const std::string& name,
-                              const std::string& type,
-                              int value);
-UI_EXPORT bool SetIntArrayProperty(XID window,
+UI_BASE_EXPORT bool SetIntProperty(XID window,
                                    const std::string& name,
                                    const std::string& type,
-                                   const std::vector<int>& value);
-UI_EXPORT bool SetAtomArrayProperty(XID window,
-                                    const std::string& name,
-                                    const std::string& type,
-                                    const std::vector<Atom>& value);
+                                   int value);
+UI_BASE_EXPORT bool SetIntArrayProperty(XID window,
+                                        const std::string& name,
+                                        const std::string& type,
+                                        const std::vector<int>& value);
+UI_BASE_EXPORT bool SetAtomArrayProperty(XID window,
+                                         const std::string& name,
+                                         const std::string& type,
+                                         const std::vector<Atom>& value);
 
 // Gets the X atom for default display corresponding to atom_name.
 Atom GetAtom(const char* atom_name);
 
 // Sets the WM_CLASS attribute for a given X11 window.
-UI_EXPORT void SetWindowClassHint(XDisplay* display,
-                                  XID window,
-                                  const std::string& res_name,
-                                  const std::string& res_class);
+UI_BASE_EXPORT void SetWindowClassHint(XDisplay* display,
+                                       XID window,
+                                       const std::string& res_name,
+                                       const std::string& res_class);
 
 // Sets the WM_WINDOW_ROLE attribute for a given X11 window.
-UI_EXPORT void SetWindowRole(XDisplay* display,
-                             XID window,
-                             const std::string& role);
+UI_BASE_EXPORT void SetWindowRole(XDisplay* display,
+                                  XID window,
+                                  const std::string& role);
 
 // Get |window|'s parent window, or None if |window| is the root window.
-UI_EXPORT XID GetParentWindow(XID window);
+UI_BASE_EXPORT XID GetParentWindow(XID window);
 
 // Walk up |window|'s hierarchy until we find a direct child of |root|.
 XID GetHighestAncestorWindow(XID window, XID root);
@@ -225,7 +230,7 @@ static const int kAllDesktops = -1;
 bool GetWindowDesktop(XID window, int* desktop);
 
 // Translates an X11 error code into a printable string.
-UI_EXPORT std::string GetX11ErrorString(XDisplay* display, int err);
+UI_BASE_EXPORT std::string GetX11ErrorString(XDisplay* display, int err);
 
 // Implementers of this interface receive a notification for every X window of
 // the main display.
@@ -241,15 +246,16 @@ class EnumerateWindowsDelegate {
 
 // Enumerates all windows in the current display.  Will recurse into child
 // windows up to a depth of |max_depth|.
-UI_EXPORT bool EnumerateAllWindows(EnumerateWindowsDelegate* delegate,
-                                   int max_depth);
+UI_BASE_EXPORT bool EnumerateAllWindows(EnumerateWindowsDelegate* delegate,
+                                        int max_depth);
 
 // Enumerates the top-level windows of the current display.
-UI_EXPORT void EnumerateTopLevelWindows(ui::EnumerateWindowsDelegate* delegate);
+UI_BASE_EXPORT void EnumerateTopLevelWindows(
+    ui::EnumerateWindowsDelegate* delegate);
 
 // Returns all children windows of a given window in top-to-bottom stacking
 // order.
-UI_EXPORT bool GetXWindowStack(XID window, std::vector<XID>* windows);
+UI_BASE_EXPORT bool GetXWindowStack(XID window, std::vector<XID>* windows);
 
 // Restack a window in relation to one of its siblings.  If |above| is true,
 // |window| will be stacked directly above |sibling|; otherwise it will stacked
@@ -259,23 +265,24 @@ void RestackWindow(XID window, XID sibling, bool above);
 
 // Return a handle to a X ShmSeg. |shared_memory_key| is a SysV
 // IPC key. The shared memory region must contain 32-bit pixels.
-UI_EXPORT XSharedMemoryId AttachSharedMemory(XDisplay* display,
-                                             int shared_memory_support);
-UI_EXPORT void DetachSharedMemory(XDisplay* display, XSharedMemoryId shmseg);
+UI_BASE_EXPORT XSharedMemoryId
+    AttachSharedMemory(XDisplay* display, int shared_memory_support);
+UI_BASE_EXPORT void DetachSharedMemory(XDisplay* display,
+                                       XSharedMemoryId shmseg);
 
 // Copies |source_bounds| from |drawable| to |canvas| at offset |dest_offset|.
 // |source_bounds| is in physical pixels, while |dest_offset| is relative to
 // the canvas's scale. Note that this function is slow since it uses
 // XGetImage() to copy the data from the X server to this process before
 // copying it to |canvas|.
-UI_EXPORT bool CopyAreaToCanvas(XID drawable,
-                                gfx::Rect source_bounds,
-                                gfx::Point dest_offset,
-                                gfx::Canvas* canvas);
+UI_BASE_EXPORT bool CopyAreaToCanvas(XID drawable,
+                                     gfx::Rect source_bounds,
+                                     gfx::Point dest_offset,
+                                     gfx::Canvas* canvas);
 
 // Return a handle to an XRender picture where |pixmap| is a handle to a
 // pixmap containing Skia ARGB data.
-UI_EXPORT XID CreatePictureFromSkiaPixmap(XDisplay* display, XID pixmap);
+UI_BASE_EXPORT XID CreatePictureFromSkiaPixmap(XDisplay* display, XID pixmap);
 
 void FreePicture(XDisplay* display, XID picture);
 void FreePixmap(XDisplay* display, XID pixmap);
@@ -296,33 +303,31 @@ enum WindowManagerName {
 };
 // Attempts to guess the window maager. Returns WM_UNKNOWN if we can't
 // determine it for one reason or another.
-UI_EXPORT WindowManagerName GuessWindowManager();
+UI_BASE_EXPORT WindowManagerName GuessWindowManager();
 
 // Change desktop for |window| to the desktop of |destination| window.
-UI_EXPORT bool ChangeWindowDesktop(XID window, XID destination);
+UI_BASE_EXPORT bool ChangeWindowDesktop(XID window, XID destination);
 
 // Enable the default X error handlers. These will log the error and abort
 // the process if called. Use SetX11ErrorHandlers() from x11_util_internal.h
 // to set your own error handlers.
-UI_EXPORT void SetDefaultX11ErrorHandlers();
+UI_BASE_EXPORT void SetDefaultX11ErrorHandlers();
 
 // Return true if a given window is in full-screen mode.
-UI_EXPORT bool IsX11WindowFullScreen(XID window);
+UI_BASE_EXPORT bool IsX11WindowFullScreen(XID window);
 
 // Returns true if a given size is in list of bogus sizes in mm that X detects
 // that should be ignored.
-UI_EXPORT bool IsXDisplaySizeBlackListed(unsigned long mm_width,
-                                         unsigned long mm_height);
+UI_BASE_EXPORT bool IsXDisplaySizeBlackListed(unsigned long mm_width,
+                                              unsigned long mm_height);
 
 // Manages a piece of X11 allocated memory as a RefCountedMemory segment. This
 // object takes ownership over the passed in memory and will free it with the
 // X11 allocator when done.
-class UI_EXPORT XRefcountedMemory : public base::RefCountedMemory {
+class UI_BASE_EXPORT XRefcountedMemory : public base::RefCountedMemory {
  public:
   XRefcountedMemory(unsigned char* x11_data, size_t length)
-      : x11_data_(length ? x11_data : NULL),
-        length_(length) {
-  }
+      : x11_data_(length ? x11_data : NULL), length_(length) {}
 
   // Overridden from RefCountedMemory:
   virtual const unsigned char* front() const OVERRIDE;
@@ -339,7 +344,7 @@ class UI_EXPORT XRefcountedMemory : public base::RefCountedMemory {
 
 // Keeps track of a string returned by an X function (e.g. XGetAtomName) and
 // makes sure it's XFree'd.
-class UI_EXPORT XScopedString {
+class UI_BASE_EXPORT XScopedString {
  public:
   explicit XScopedString(char* str) : string_(str) {}
   ~XScopedString();
@@ -354,18 +359,14 @@ class UI_EXPORT XScopedString {
 
 // Keeps track of an image returned by an X function (e.g. XGetImage) and
 // makes sure it's XDestroyImage'd.
-class UI_EXPORT XScopedImage {
+class UI_BASE_EXPORT XScopedImage {
  public:
   explicit XScopedImage(XImage* image) : image_(image) {}
   ~XScopedImage();
 
-  XImage* get() const {
-    return image_;
-  }
+  XImage* get() const { return image_; }
 
-  XImage* operator->() const {
-    return image_;
-  }
+  XImage* operator->() const { return image_; }
 
   void reset(XImage* image);
 
@@ -377,7 +378,7 @@ class UI_EXPORT XScopedImage {
 
 // Keeps track of a cursor returned by an X function and makes sure it's
 // XFreeCursor'd.
-class UI_EXPORT XScopedCursor {
+class UI_BASE_EXPORT XScopedCursor {
  public:
   // Keeps track of |cursor| created with |display|.
   XScopedCursor(::Cursor cursor, XDisplay* display);
diff --git a/ui/base/x/x11_util_internal.h b/ui/base/x/x11_util_internal.h
index b6816c7..7ef974b 100644
--- a/ui/base/x/x11_util_internal.h
+++ b/ui/base/x/x11_util_internal.h
@@ -12,13 +12,13 @@
 // when needed.
 
 extern "C" {
+#include <X11/extensions/Xrender.h>
+#include <X11/extensions/XShm.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
-#include <X11/extensions/XShm.h>
-#include <X11/extensions/Xrender.h>
 }
 
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
@@ -32,22 +32,22 @@ XRenderPictFormat* GetRenderARGB32Format(Display* dpy);
 
 // Get the XRENDER format id for the default visual on the first screen. This
 // is the format which our GTK window will have.
-UI_EXPORT XRenderPictFormat* GetRenderVisualFormat(Display* dpy,
-                                                   Visual* visual);
+UI_BASE_EXPORT XRenderPictFormat* GetRenderVisualFormat(Display* dpy,
+                                                        Visual* visual);
 
 // --------------------------------------------------------------------------
 // X11 error handling.
 // Sets the X Error Handlers. Passing NULL for either will enable the default
 // error handler, which if called will log the error and abort the process.
-UI_EXPORT void SetX11ErrorHandlers(XErrorHandler error_handler,
-                                   XIOErrorHandler io_error_handler);
+UI_BASE_EXPORT void SetX11ErrorHandlers(XErrorHandler error_handler,
+                                        XIOErrorHandler io_error_handler);
 
 // NOTE: This function should not be called directly from the
 // X11 Error handler because it queries the server to decode the
 // error message, which may trigger other errors. A suitable workaround
 // is to post a task in the error handler to call this function.
-UI_EXPORT void LogErrorEventDescription(Display* dpy,
-                                        const XErrorEvent& error_event);
+UI_BASE_EXPORT void LogErrorEventDescription(Display* dpy,
+                                             const XErrorEvent& error_event);
 
 }  // namespace ui