Rename VIEWS_API to VIEWS_EXPORT.

R=rvargas@chromium.org
Review URL: http://codereview.chromium.org/7550038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95651 0039d316-1c4b-4281-b951-d872f2087c98

45 files changed, 78 insertions, 78 deletions

diff --git a/views/controls/button/button.h b/views/controls/button/button.h
index c58433f..dde56c1 100644
--- a/views/controls/button/button.h
+++ b/views/controls/button/button.h
@@ -15,7 +15,7 @@ class Event;
 
 // An interface implemented by an object to let it know that a button was
 // pressed.
-class VIEWS_API ButtonListener {
+class VIEWS_EXPORT ButtonListener {
  public:
   virtual void ButtonPressed(Button* sender, const views::Event& event) = 0;
 
@@ -25,7 +25,7 @@ class VIEWS_API ButtonListener {
 
 // A View representing a button. Depending on the specific type, the button
 // could be implemented by a native control or custom rendered.
-class VIEWS_API Button : public View {
+class VIEWS_EXPORT Button : public View {
  public:
   virtual ~Button();
 
diff --git a/views/controls/button/button_dropdown.h b/views/controls/button/button_dropdown.h
index 950aec8..cc5dc19 100644
--- a/views/controls/button/button_dropdown.h
+++ b/views/controls/button/button_dropdown.h
@@ -23,7 +23,7 @@ namespace views {
 // display a menu
 //
 ////////////////////////////////////////////////////////////////////////////////
-class VIEWS_API ButtonDropDown : public ImageButton {
+class VIEWS_EXPORT ButtonDropDown : public ImageButton {
  public:
   // The button's class name.
   static const char kViewClassName[];
diff --git a/views/controls/button/checkbox.h b/views/controls/button/checkbox.h
index 583dc5d..e8d52b6 100644
--- a/views/controls/button/checkbox.h
+++ b/views/controls/button/checkbox.h
@@ -14,7 +14,7 @@ namespace views {
 
 // A native themed class representing a checkbox.  This class does not use
 // platform specific objects to replicate the native platforms looks and feel.
-class VIEWS_API Checkbox : public TextButtonBase {
+class VIEWS_EXPORT Checkbox : public TextButtonBase {
  public:
   // The button's class name.
   static const char kViewClassName[];
diff --git a/views/controls/button/custom_button.h b/views/controls/button/custom_button.h
index ce45405..ac1a79e 100644
--- a/views/controls/button/custom_button.h
+++ b/views/controls/button/custom_button.h
@@ -20,8 +20,8 @@ namespace views {
 // Note that this type of button is not focusable by default and will not be
 // part of the focus chain.  Call set_focusable(true) to make it part of the
 // focus chain.
-class VIEWS_API CustomButton : public Button,
-                               public ui::AnimationDelegate {
+class VIEWS_EXPORT CustomButton : public Button,
+                                  public ui::AnimationDelegate {
  public:
   // The menu button's class name.
   static const char kViewClassName[];
diff --git a/views/controls/button/image_button.h b/views/controls/button/image_button.h
index 5e11244..95f4b47 100644
--- a/views/controls/button/image_button.h
+++ b/views/controls/button/image_button.h
@@ -17,7 +17,7 @@ namespace views {
 // part of the focus chain.  Call set_focusable(true) to make it part of the
 // focus chain.
 
-class VIEWS_API ImageButton : public CustomButton {
+class VIEWS_EXPORT ImageButton : public CustomButton {
  public:
   explicit ImageButton(ButtonListener* listener);
   virtual ~ImageButton();
@@ -79,7 +79,7 @@ class VIEWS_API ImageButton : public CustomButton {
 // A toggle-able ImageButton.  It swaps out its graphics when toggled.
 //
 ////////////////////////////////////////////////////////////////////////////////
-class VIEWS_API ToggleImageButton : public ImageButton {
+class VIEWS_EXPORT ToggleImageButton : public ImageButton {
  public:
   explicit ToggleImageButton(ButtonListener* listener);
   virtual ~ToggleImageButton();
diff --git a/views/controls/button/menu_button.h b/views/controls/button/menu_button.h
index 2cc88bf..ce84526 100644
--- a/views/controls/button/menu_button.h
+++ b/views/controls/button/menu_button.h
@@ -26,7 +26,7 @@ class ViewMenuDelegate;
 //  A button that shows a menu when the left mouse button is pushed
 //
 ////////////////////////////////////////////////////////////////////////////////
-class VIEWS_API MenuButton : public TextButton {
+class VIEWS_EXPORT MenuButton : public TextButton {
  public:
   // The menu button's class name.
   static const char kViewClassName[];
diff --git a/views/controls/button/radio_button.h b/views/controls/button/radio_button.h
index a56b256..c9d3711 100644
--- a/views/controls/button/radio_button.h
+++ b/views/controls/button/radio_button.h
@@ -12,7 +12,7 @@ namespace views {
 
 // A native themed class representing a radio button.  This class does not use
 // platform specific objects to replicate the native platforms looks and feel.
-class VIEWS_API RadioButton : public Checkbox {
+class VIEWS_EXPORT RadioButton : public Checkbox {
  public:
   // The button's class name.
   static const char kViewClassName[];
diff --git a/views/controls/button/text_button.h b/views/controls/button/text_button.h
index ced8f58..2a2c450 100644
--- a/views/controls/button/text_button.h
+++ b/views/controls/button/text_button.h
@@ -31,7 +31,7 @@ namespace views {
 // focus chain.
 //
 ////////////////////////////////////////////////////////////////////////////////
-class VIEWS_API TextButtonBorder : public Border {
+class VIEWS_EXPORT TextButtonBorder : public Border {
  public:
   TextButtonBorder();
   virtual ~TextButtonBorder();
@@ -90,7 +90,7 @@ class VIEWS_API TextButtonBorder : public Border {
 //  states, with possible animation between states.
 //
 ////////////////////////////////////////////////////////////////////////////////
-class VIEWS_API TextButtonNativeThemeBorder : public Border {
+class VIEWS_EXPORT TextButtonNativeThemeBorder : public Border {
  public:
    TextButtonNativeThemeBorder(NativeThemeDelegate* delegate);
   virtual ~TextButtonNativeThemeBorder();
@@ -117,8 +117,8 @@ class VIEWS_API TextButtonNativeThemeBorder : public Border {
 //  passed to SetText. To reset the cached max size invoke ClearMaxTextSize.
 //
 ////////////////////////////////////////////////////////////////////////////////
-class VIEWS_API TextButtonBase : public CustomButton,
-                                 public NativeThemeDelegate {
+class VIEWS_EXPORT TextButtonBase : public CustomButton,
+                                    public NativeThemeDelegate {
  public:
   // The menu button's class name.
   static const char kViewClassName[];
@@ -314,7 +314,7 @@ class VIEWS_API TextButtonBase : public CustomButton,
 //  passed to SetText. To reset the cached max size invoke ClearMaxTextSize.
 //
 ////////////////////////////////////////////////////////////////////////////////
-class VIEWS_API TextButton : public TextButtonBase {
+class VIEWS_EXPORT TextButton : public TextButtonBase {
  public:
   // The button's class name.
   static const char kViewClassName[];
@@ -399,7 +399,7 @@ class VIEWS_API TextButton : public TextButtonBase {
 //  like ignore-minimize-size and text alignment minimum size.
 //
 ////////////////////////////////////////////////////////////////////////////////
-class VIEWS_API NativeTextButton : public TextButton {
+class VIEWS_EXPORT NativeTextButton : public TextButton {
  public:
   // The button's class name.
   static const char kViewClassName[];
diff --git a/views/controls/combobox/combobox.h b/views/controls/combobox/combobox.h
index 6a472b5..2576fa3 100644
--- a/views/controls/combobox/combobox.h
+++ b/views/controls/combobox/combobox.h
@@ -20,7 +20,7 @@ using ui::ComboboxModel;
 namespace views {
 
 // A non-editable combo-box (aka a drop-down list)
-class VIEWS_API Combobox : public View {
+class VIEWS_EXPORT Combobox : public View {
  public:
   // The combobox's class name.
   static const char kViewClassName[];
diff --git a/views/controls/combobox/native_combobox_wrapper.h b/views/controls/combobox/native_combobox_wrapper.h
index f84225a..327d02db 100644
--- a/views/controls/combobox/native_combobox_wrapper.h
+++ b/views/controls/combobox/native_combobox_wrapper.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "ui/gfx/native_widget_types.h"
-#include "views/views_api.h"
+#include "views/views_export.h"
 
 namespace gfx{
 class Size;
@@ -19,7 +19,7 @@ class Combobox;
 class KeyEvent;
 class View;
 
-class VIEWS_API NativeComboboxWrapper {
+class VIEWS_EXPORT NativeComboboxWrapper {
  public:
   // Updates the combobox's content from its model.
   virtual void UpdateFromModel() = 0;
diff --git a/views/controls/image_view.h b/views/controls/image_view.h
index 7096c29..7a346b3 100644
--- a/views/controls/image_view.h
+++ b/views/controls/image_view.h
@@ -25,7 +25,7 @@ namespace views {
 // provided image size.
 //
 /////////////////////////////////////////////////////////////////////////////
-class VIEWS_API ImageView : public View {
+class VIEWS_EXPORT ImageView : public View {
  public:
   enum Alignment {
     LEADING = 0,
diff --git a/views/controls/label.h b/views/controls/label.h
index 8615a9d..51aa553 100644
--- a/views/controls/label.h
+++ b/views/controls/label.h
@@ -23,7 +23,7 @@ namespace views {
 // A label is a view subclass that can display a string.
 //
 /////////////////////////////////////////////////////////////////////////////
-class VIEWS_API Label : public View {
+class VIEWS_EXPORT Label : public View {
  public:
   enum Alignment { ALIGN_LEFT = 0,
                    ALIGN_CENTER,
diff --git a/views/controls/link.h b/views/controls/link.h
index 0ba6a38..2392bee 100644
--- a/views/controls/link.h
+++ b/views/controls/link.h
@@ -22,7 +22,7 @@ class LinkListener;
 // controller which is notified when a click occurs.
 //
 ////////////////////////////////////////////////////////////////////////////////
-class VIEWS_API Link : public Label {
+class VIEWS_EXPORT Link : public Label {
  public:
   Link();
   explicit Link(const std::wstring& title);
diff --git a/views/controls/menu/menu.h b/views/controls/menu/menu.h
index ee3f018f..a6e3971 100644
--- a/views/controls/menu/menu.h
+++ b/views/controls/menu/menu.h
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "ui/gfx/native_widget_types.h"
-#include "views/views_api.h"
+#include "views/views_export.h"
 
 class SkBitmap;
 
@@ -22,7 +22,7 @@ namespace views {
 
 class Accelerator;
 
-class VIEWS_API Menu {
+class VIEWS_EXPORT Menu {
  public:
   /////////////////////////////////////////////////////////////////////////////
   //
@@ -32,7 +32,7 @@ class VIEWS_API Menu {
   //  item as it is created.
   //
   /////////////////////////////////////////////////////////////////////////////
-  class VIEWS_API Delegate {
+  class VIEWS_EXPORT Delegate {
    public:
     virtual ~Delegate() {}
 
diff --git a/views/controls/menu/menu_2.h b/views/controls/menu/menu_2.h
index 9357290..5a93179 100644
--- a/views/controls/menu/menu_2.h
+++ b/views/controls/menu/menu_2.h
@@ -9,7 +9,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/models/menu_model.h"
 #include "views/controls/menu/menu_wrapper.h"
-#include "views/views_api.h"
+#include "views/views_export.h"
 
 namespace gfx {
 class Point;
@@ -25,7 +25,7 @@ class View;
 // WARNING: do NOT create and use Menu2 on the stack. Menu2 notifies the model
 // of selection AFTER a delay. This means that if use a Menu2 on the stack
 // ActivatedAt is never invoked.
-class VIEWS_API Menu2 {
+class VIEWS_EXPORT Menu2 {
  public:
   // Creates a new menu populated with the contents of |model|.
   // WARNING: this populates the menu on construction by invoking methods on
diff --git a/views/controls/menu/menu_config.h b/views/controls/menu/menu_config.h
index dc2b7a3..3c566e8 100644
--- a/views/controls/menu/menu_config.h
+++ b/views/controls/menu/menu_config.h
@@ -8,13 +8,13 @@
 
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/font.h"
-#include "views/views_api.h"
+#include "views/views_export.h"
 
 namespace views {
 
 // Layout type information for menu items. Use the instance() method to obtain
 // the MenuConfig for the current platform.
-struct VIEWS_API MenuConfig {
+struct VIEWS_EXPORT MenuConfig {
   MenuConfig();
   ~MenuConfig();
 
diff --git a/views/controls/menu/menu_controller.h b/views/controls/menu/menu_controller.h
index ecd1fcb..84efb5b 100644
--- a/views/controls/menu/menu_controller.h
+++ b/views/controls/menu/menu_controller.h
@@ -37,7 +37,7 @@ class View;
 // MenuController is used internally by the various menu classes to manage
 // showing, selecting and drag/drop for menus. All relevant events are
 // forwarded to the MenuController from SubmenuView and MenuHost.
-class VIEWS_API MenuController : public MessageLoop::Dispatcher {
+class VIEWS_EXPORT MenuController : public MessageLoop::Dispatcher {
  public:
   friend class MenuHostRootView;
   friend class MenuItemView;
diff --git a/views/controls/menu/menu_delegate.h b/views/controls/menu/menu_delegate.h
index 13b457d..f76569e 100644
--- a/views/controls/menu/menu_delegate.h
+++ b/views/controls/menu/menu_delegate.h
@@ -33,7 +33,7 @@ class MenuButton;
 // Delegate for a menu. This class is used as part of MenuItemView, see it
 // for details.
 // TODO(sky): merge this with ui::MenuModel.
-class VIEWS_API MenuDelegate {
+class VIEWS_EXPORT MenuDelegate {
  public:
   // Used during drag and drop to indicate where the drop indicator should
   // be rendered.
diff --git a/views/controls/menu/menu_item_view.h b/views/controls/menu/menu_item_view.h
index ae04cc6..6a57979 100644
--- a/views/controls/menu/menu_item_view.h
+++ b/views/controls/menu/menu_item_view.h
@@ -66,7 +66,7 @@ struct MenuConfig;
 //    and does NOT block the caller. Instead the delegate is notified when the
 //    menu closes via the DropMenuClosed method.
 
-class VIEWS_API MenuItemView : public View {
+class VIEWS_EXPORT MenuItemView : public View {
  public:
   friend class MenuController;
 
diff --git a/views/controls/menu/menu_model_adapter.h b/views/controls/menu/menu_model_adapter.h
index f1c5a7d..a1a90a2 100644
--- a/views/controls/menu/menu_model_adapter.h
+++ b/views/controls/menu/menu_model_adapter.h
@@ -19,7 +19,7 @@ class MenuItemView;
 
 // This class wraps an instance of ui::MenuModel with the
 // views::MenuDelegate interface required by views::MenuItemView.
-class VIEWS_API MenuModelAdapter : public MenuDelegate {
+class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate {
  public:
   // The caller retains ownership of the ui::MenuModel instance and
   // must ensure it exists for the lifetime of the adapter.
diff --git a/views/controls/menu/menu_runner.h b/views/controls/menu/menu_runner.h
index 873a201..1337d08 100644
--- a/views/controls/menu/menu_runner.h
+++ b/views/controls/menu/menu_runner.h
@@ -25,7 +25,7 @@ class Widget;
 //
 // TODO: this is a work around for 57890. If we fix it this class shouldn't be
 // needed.
-class VIEWS_API MenuRunner {
+class VIEWS_EXPORT MenuRunner {
  public:
   explicit MenuRunner(MenuItemView* menu);
   ~MenuRunner();
diff --git a/views/controls/menu/menu_wrapper.h b/views/controls/menu/menu_wrapper.h
index a6e67d0..9281e70 100644
--- a/views/controls/menu/menu_wrapper.h
+++ b/views/controls/menu/menu_wrapper.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "ui/gfx/native_widget_types.h"
-#include "views/views_api.h"
+#include "views/views_export.h"
 
 namespace gfx {
 class Point;
@@ -25,7 +25,7 @@ class MenuListener {
 };
 
 // An interface that wraps an object that implements a menu.
-class VIEWS_API MenuWrapper {
+class VIEWS_EXPORT MenuWrapper {
  public:
   // All of the possible actions that can result from RunMenuAt.
   enum MenuAction {
diff --git a/views/controls/menu/native_menu_win.h b/views/controls/menu/native_menu_win.h
index 8eff891..3d232c1 100644
--- a/views/controls/menu/native_menu_win.h
+++ b/views/controls/menu/native_menu_win.h
@@ -12,13 +12,13 @@
 #include "base/task.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "views/controls/menu/menu_wrapper.h"
-#include "views/views_api.h"
+#include "views/views_export.h"
 
 namespace views {
 
 // A Windows implementation of MenuWrapper.
 // TODO(beng): rename to MenuWin once the old class is dead.
-class VIEWS_API NativeMenuWin : public MenuWrapper {
+class VIEWS_EXPORT NativeMenuWin : public MenuWrapper {
  public:
   // Construct a NativeMenuWin, with a model and delegate. If |system_menu_for|
   // is non-NULL, the NativeMenuWin wraps the system menu for that window.
@@ -160,7 +160,7 @@ class VIEWS_API NativeMenuWin : public MenuWrapper {
 
 // A SimpleMenuModel subclass that allows the system menu for a window to be
 // wrapped.
-class VIEWS_API SystemMenuModel : public ui::SimpleMenuModel {
+class VIEWS_EXPORT SystemMenuModel : public ui::SimpleMenuModel {
  public:
   explicit SystemMenuModel(Delegate* delegate);
   virtual ~SystemMenuModel();
diff --git a/views/controls/menu/submenu_view.h b/views/controls/menu/submenu_view.h
index e9d4227..037efbc 100644
--- a/views/controls/menu/submenu_view.h
+++ b/views/controls/menu/submenu_view.h
@@ -32,7 +32,7 @@ class MenuScrollViewContainer;
 // MenuScrollViewContainer handles showing as much of the SubmenuView as the
 // screen allows. If the SubmenuView is taller than the screen, scroll buttons
 // are provided that allow the user to see all the menu items.
-class VIEWS_API SubmenuView : public View {
+class VIEWS_EXPORT SubmenuView : public View {
  public:
   // The submenu's class name.
   static const char kViewClassName[];
diff --git a/views/controls/message_box_view.h b/views/controls/message_box_view.h
index a9ede6f..9d728ac 100644
--- a/views/controls/message_box_view.h
+++ b/views/controls/message_box_view.h
@@ -21,7 +21,7 @@ class Textfield;
 // This class displays the contents of a message box. It is intended for use
 // within a constrained window, and has options for a message, prompt, OK
 // and Cancel buttons.
-class VIEWS_API MessageBoxView : public View {
+class VIEWS_EXPORT MessageBoxView : public View {
  public:
   MessageBoxView(int dialog_flags,
                  const std::wstring& message,
diff --git a/views/controls/native/native_view_host.h b/views/controls/native/native_view_host.h
index a9c606b..ecb541d 100644
--- a/views/controls/native/native_view_host.h
+++ b/views/controls/native/native_view_host.h
@@ -19,7 +19,7 @@ class NativeViewHostWrapper;
 // kept in sync with the bounds of this view as it is moved and sized.
 // Under the hood, a platform-specific NativeViewHostWrapper implementation does
 // the platform-specific work of manipulating the underlying OS widget type.
-class VIEWS_API NativeViewHost : public View {
+class VIEWS_EXPORT NativeViewHost : public View {
  public:
   // The NativeViewHost's class name.
   static const char kViewClassName[];
diff --git a/views/controls/native_control.h b/views/controls/native_control.h
index 395811f..7092b2f 100644
--- a/views/controls/native_control.h
+++ b/views/controls/native_control.h
@@ -23,7 +23,7 @@ class NativeControlContainer;
 // wrap a new kind of control
 //
 ////////////////////////////////////////////////////////////////////////////////
-class VIEWS_API NativeControl : public View {
+class VIEWS_EXPORT NativeControl : public View {
  public:
    enum Alignment {
      LEADING = 0,
diff --git a/views/controls/progress_bar.h b/views/controls/progress_bar.h
index 0de768b..61c050f 100644
--- a/views/controls/progress_bar.h
+++ b/views/controls/progress_bar.h
@@ -26,7 +26,7 @@ namespace views {
 //
 /////////////////////////////////////////////////////////////////////////////
 
-class VIEWS_API ProgressBar : public View {
+class VIEWS_EXPORT ProgressBar : public View {
  public:
   ProgressBar();
   virtual ~ProgressBar();
diff --git a/views/controls/resize_area.h b/views/controls/resize_area.h
index c6abf15..9211229 100644
--- a/views/controls/resize_area.h
+++ b/views/controls/resize_area.h
@@ -17,7 +17,7 @@ namespace views {
 // An invisible area that acts like a horizontal resizer.
 //
 ////////////////////////////////////////////////////////////////////////////////
-class VIEWS_API ResizeArea : public View {
+class VIEWS_EXPORT ResizeArea : public View {
  public:
   //////////////////////////////////////////////////////////////////////////////
   //
diff --git a/views/controls/scroll_view.h b/views/controls/scroll_view.h
index 1a25d68..af32390 100644
--- a/views/controls/scroll_view.h
+++ b/views/controls/scroll_view.h
@@ -26,7 +26,7 @@ namespace views {
 //
 /////////////////////////////////////////////////////////////////////////////
 
-class VIEWS_API ScrollView : public View, public ScrollBarController {
+class VIEWS_EXPORT ScrollView : public View, public ScrollBarController {
  public:
   static const char* const kViewClassName;
 
diff --git a/views/controls/scrollbar/native_scroll_bar.h b/views/controls/scrollbar/native_scroll_bar.h
index 5bcb0a2..6324093 100644
--- a/views/controls/scrollbar/native_scroll_bar.h
+++ b/views/controls/scrollbar/native_scroll_bar.h
@@ -17,7 +17,7 @@ class NativeScrollBarWrapper;
 
 // The NativeScrollBar class is a scrollbar that uses platform's
 // native control.
-class VIEWS_API NativeScrollBar : public ScrollBar {
+class VIEWS_EXPORT NativeScrollBar : public ScrollBar {
  public:
   // The scroll-bar's class name.
   static const char kViewClassName[];
diff --git a/views/controls/scrollbar/scroll_bar.h b/views/controls/scrollbar/scroll_bar.h
index bbc0d21..a2115c3 100644
--- a/views/controls/scrollbar/scroll_bar.h
+++ b/views/controls/scrollbar/scroll_bar.h
@@ -21,7 +21,7 @@ class ScrollBar;
 // receive notification from a scrollbar
 //
 /////////////////////////////////////////////////////////////////////////////
-class VIEWS_API ScrollBarController {
+class VIEWS_EXPORT ScrollBarController {
  public:
 
   // Invoked by the scrollbar when the scrolling position changes
@@ -55,7 +55,7 @@ class VIEWS_API ScrollBarController {
 // A scrollbar is either horizontal or vertical
 //
 /////////////////////////////////////////////////////////////////////////////
-class VIEWS_API ScrollBar : public View {
+class VIEWS_EXPORT ScrollBar : public View {
  public:
   virtual ~ScrollBar();
 
diff --git a/views/controls/separator.h b/views/controls/separator.h
index 50f2918..b9f1eff 100644
--- a/views/controls/separator.h
+++ b/views/controls/separator.h
@@ -15,7 +15,7 @@ namespace views {
 // The Separator class is a view that shows a line used to visually separate
 // other views.  The current implementation is only horizontal.
 
-class VIEWS_API Separator : public View {
+class VIEWS_EXPORT Separator : public View {
  public:
   // The separator's class name.
   static const char kViewClassName[];
diff --git a/views/controls/single_split_view.h b/views/controls/single_split_view.h
index a77ae62..6d4fc6b 100644
--- a/views/controls/single_split_view.h
+++ b/views/controls/single_split_view.h
@@ -16,7 +16,7 @@ namespace views {
 // drag around to resize the views.
 // Observer's SplitHandleMoved notification helps to monitor user initiated
 // layout changes.
-class VIEWS_API SingleSplitView : public View {
+class VIEWS_EXPORT SingleSplitView : public View {
  public:
   enum Orientation {
     HORIZONTAL_SPLIT,
diff --git a/views/controls/tabbed_pane/tabbed_pane.h b/views/controls/tabbed_pane/tabbed_pane.h
index 96b10ad3..b323098 100644
--- a/views/controls/tabbed_pane/tabbed_pane.h
+++ b/views/controls/tabbed_pane/tabbed_pane.h
@@ -17,7 +17,7 @@ class TabbedPaneListener;
 
 // TabbedPane is a view that shows tabs. When the user clicks on a tab, the
 // associated view is displayed.
-class VIEWS_API TabbedPane : public View {
+class VIEWS_EXPORT TabbedPane : public View {
  public:
   TabbedPane();
   virtual ~TabbedPane();
diff --git a/views/controls/table/group_table_view.h b/views/controls/table/group_table_view.h
index 9de687d..dff2f28 100644
--- a/views/controls/table/group_table_view.h
+++ b/views/controls/table/group_table_view.h
@@ -29,7 +29,7 @@ class GroupTableModel : public TableModel {
   virtual void GetGroupRangeForItem(int item, GroupRange* range) = 0;
 };
 
-class VIEWS_API GroupTableView : public TableView {
+class VIEWS_EXPORT GroupTableView : public TableView {
  public:
    // The view class name.
    static const char kViewClassName[];
diff --git a/views/controls/table/table_view.h b/views/controls/table/table_view.h
index 8594a61..89efc5a 100644
--- a/views/controls/table/table_view.h
+++ b/views/controls/table/table_view.h
@@ -20,7 +20,7 @@ typedef struct tagNMLVCUSTOMDRAW NMLVCUSTOMDRAW;
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/models/table_model_observer.h"
-#include "views/views_api.h"
+#include "views/views_export.h"
 
 #if defined(OS_WIN)
 // TODO(port): remove the ifdef when native_control.h is ported.
@@ -81,7 +81,7 @@ enum TableTypes {
 };
 
 // Returned from SelectionBegin/SelectionEnd
-class VIEWS_API TableSelectionIterator {
+class VIEWS_EXPORT TableSelectionIterator {
  public:
   TableSelectionIterator(TableView* view, int view_index);
   TableSelectionIterator& operator=(const TableSelectionIterator& other);
@@ -103,8 +103,8 @@ class VIEWS_API TableSelectionIterator {
 
 #if defined(OS_WIN)
 // TODO(port): Port TableView.
-class VIEWS_API TableView : public NativeControl,
-                            public TableModelObserver {
+class VIEWS_EXPORT TableView : public NativeControl,
+                               public TableModelObserver {
  public:
   typedef TableSelectionIterator iterator;
 
diff --git a/views/controls/table/table_view2.h b/views/controls/table/table_view2.h
index eeeaf7b..60a68f9 100644
--- a/views/controls/table/table_view2.h
+++ b/views/controls/table/table_view2.h
@@ -53,7 +53,7 @@ class TableView;
 class TableViewObserver;
 class View;
 
-class VIEWS_API TableView2 : public View, public TableModelObserver {
+class VIEWS_EXPORT TableView2 : public View, public TableModelObserver {
  public:
   typedef TableSelectionIterator iterator;
 
diff --git a/views/controls/textfield/native_textfield_views.h b/views/controls/textfield/native_textfield_views.h
index 97555dc..894edfa 100644
--- a/views/controls/textfield/native_textfield_views.h
+++ b/views/controls/textfield/native_textfield_views.h
@@ -42,12 +42,12 @@ class MenuModelAdapter;
 // * X selection (only if we want to support).
 // Once completed, this will replace Textfield, NativeTextfieldWin and
 // NativeTextfieldGtk.
-class VIEWS_API NativeTextfieldViews : public TouchSelectionClientView,
-                                       public ContextMenuController,
-                                       public DragController,
-                                       public NativeTextfieldWrapper,
-                                       public TextInputClient,
-                                       public TextfieldViewsModel::Delegate {
+class VIEWS_EXPORT NativeTextfieldViews : public TouchSelectionClientView,
+                                          public ContextMenuController,
+                                          public DragController,
+                                          public NativeTextfieldWrapper,
+                                          public TextInputClient,
+                                          public TextfieldViewsModel::Delegate {
  public:
   explicit NativeTextfieldViews(Textfield* parent);
   virtual ~NativeTextfieldViews();
diff --git a/views/controls/textfield/native_textfield_win.h b/views/controls/textfield/native_textfield_win.h
index 53c2327..efd59d0 100644
--- a/views/controls/textfield/native_textfield_win.h
+++ b/views/controls/textfield/native_textfield_win.h
@@ -44,15 +44,15 @@ class NativeTextfieldWin
 
   // Returns true if the current point is close enough to the origin point in
   // space and time that it would be considered a double click.
-  VIEWS_API static bool IsDoubleClick(const POINT& origin,
-                                      const POINT& current,
-                                      DWORD elapsed_time);
+  VIEWS_EXPORT static bool IsDoubleClick(const POINT& origin,
+                                         const POINT& current,
+                                         DWORD elapsed_time);
 
   // Returns true if the virtual key code is a digit coming from the numeric
   // keypad (with or without NumLock on).  |extended_key| should be set to the
   // extended key flag specified in the WM_KEYDOWN/UP where the |key_code|
   // originated.
-  VIEWS_API static bool IsNumPadDigit(int key_code, bool extended_key);
+  VIEWS_EXPORT static bool IsNumPadDigit(int key_code, bool extended_key);
 
   // See the code in textfield.cc that calls this for why this is here.
   void AttachHack();
diff --git a/views/controls/textfield/native_textfield_wrapper.h b/views/controls/textfield/native_textfield_wrapper.h
index 1a1e589..d910ffb 100644
--- a/views/controls/textfield/native_textfield_wrapper.h
+++ b/views/controls/textfield/native_textfield_wrapper.h
@@ -8,7 +8,7 @@
 
 #include "base/string16.h"
 #include "ui/gfx/native_widget_types.h"
-#include "views/views_api.h"
+#include "views/views_export.h"
 
 namespace gfx {
 class Insets;
@@ -28,7 +28,7 @@ class View;
 
 // An interface implemented by an object that provides a platform-native
 // text field.
-class VIEWS_API NativeTextfieldWrapper {
+class VIEWS_EXPORT NativeTextfieldWrapper {
  public:
   // The Textfield calls this when it is destroyed to clean up the wrapper
   // object.
diff --git a/views/controls/textfield/textfield.h b/views/controls/textfield/textfield.h
index 0cbb101..ad0198c 100644
--- a/views/controls/textfield/textfield.h
+++ b/views/controls/textfield/textfield.h
@@ -42,7 +42,7 @@ class KeyEvent;
 class TextfieldController;
 
 // This class implements a View that wraps a native text (edit) field.
-class VIEWS_API Textfield : public View {
+class VIEWS_EXPORT Textfield : public View {
  public:
   // The button's class name.
   static const char kViewClassName[];
diff --git a/views/controls/textfield/textfield_views_model.h b/views/controls/textfield/textfield_views_model.h
index 0fadf12..616255f 100644
--- a/views/controls/textfield/textfield_views_model.h
+++ b/views/controls/textfield/textfield_views_model.h
@@ -16,7 +16,7 @@
 #include "ui/base/ime/composition_text.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/render_text.h"
-#include "views/views_api.h"
+#include "views/views_export.h"
 
 namespace gfx {
 class Canvas;
@@ -52,12 +52,12 @@ enum MergeType {
 
 // A model that represents a text content for TextfieldViews.
 // It supports editing, selection and cursor manipulation.
-class VIEWS_API TextfieldViewsModel {
+class VIEWS_EXPORT TextfieldViewsModel {
  public:
 
   // Delegate interface implemented by the textfield view class to provided
   // additional functionalities required by the model.
-  class VIEWS_API Delegate {
+  class VIEWS_EXPORT Delegate {
    public:
     // Called when the current composition text is confirmed or cleared.
     virtual void OnCompositionTextConfirmedOrCleared() = 0;
diff --git a/views/controls/throbber.h b/views/controls/throbber.h
index 66f7e5d..a14d8b5 100644
--- a/views/controls/throbber.h
+++ b/views/controls/throbber.h
@@ -17,7 +17,7 @@ class SkBitmap;
 
 namespace views {
 
-class VIEWS_API Throbber : public View {
+class VIEWS_EXPORT Throbber : public View {
  public:
   // |frame_time_ms| is the amount of time that should elapse between frames
   //                 (in milliseconds)
@@ -59,7 +59,7 @@ class VIEWS_API Throbber : public View {
 // and nonoverlapping bursts of work.  SmoothedThrobber ignores small
 // pauses in the work stops and starts, and only starts its throbber after
 // a small amount of work time has passed.
-class VIEWS_API SmoothedThrobber : public Throbber {
+class VIEWS_EXPORT SmoothedThrobber : public Throbber {
  public:
   SmoothedThrobber(int frame_delay_ms);
   SmoothedThrobber(int frame_delay_ms, SkBitmap* frames);
@@ -97,7 +97,7 @@ class VIEWS_API SmoothedThrobber : public Throbber {
 //   2. working (which paints the throbber animation)
 //   3. completed (which paints a checkmark)
 //
-class VIEWS_API CheckmarkThrobber : public Throbber {
+class VIEWS_EXPORT CheckmarkThrobber : public Throbber {
  public:
   CheckmarkThrobber();
 
diff --git a/views/controls/tree/tree_view.h b/views/controls/tree/tree_view.h
index 28f6ddc..dac2804 100644
--- a/views/controls/tree/tree_view.h
+++ b/views/controls/tree/tree_view.h
@@ -45,7 +45,7 @@ class TreeViewController {
 // TreeView displays hierarchical data as returned from a TreeModel. The user
 // can expand, collapse and edit the items. A Controller may be attached to
 // receive notification of selection changes and restrict editing.
-class VIEWS_API TreeView : public NativeControl, ui::TreeModelObserver {
+class VIEWS_EXPORT TreeView : public NativeControl, ui::TreeModelObserver {
  public:
   TreeView();
   virtual ~TreeView();