diff options
104 files changed, 256 insertions, 255 deletions
diff --git a/views/accelerator.h b/views/accelerator.h index 20638b3..3dc2f0e9 100644 --- a/views/accelerator.h +++ b/views/accelerator.h @@ -17,11 +17,11 @@ #include "base/string16.h" #include "ui/base/models/accelerator.h" #include "views/events/event.h" -#include "views/views_api.h" +#include "views/views_export.h" namespace views { -class VIEWS_API Accelerator : public ui::Accelerator { +class VIEWS_EXPORT Accelerator : public ui::Accelerator { public: Accelerator() : ui::Accelerator() {} @@ -60,7 +60,7 @@ class VIEWS_API Accelerator : public ui::Accelerator { // An interface that classes that want to register for keyboard accelerators // should implement. -class VIEWS_API AcceleratorTarget { +class VIEWS_EXPORT AcceleratorTarget { public: // This method should return true if the accelerator was processed. virtual bool AcceleratorPressed(const Accelerator& accelerator) = 0; diff --git a/views/animation/bounds_animator.h b/views/animation/bounds_animator.h index a044ede..c55a00e 100644 --- a/views/animation/bounds_animator.h +++ b/views/animation/bounds_animator.h @@ -12,7 +12,7 @@ #include "ui/base/animation/animation_container_observer.h" #include "ui/base/animation/animation_delegate.h" #include "ui/gfx/rect.h" -#include "views/views_api.h" +#include "views/views_export.h" namespace ui { class SlideAnimation; @@ -39,8 +39,8 @@ class BoundsAnimatorObserver { // You can attach an AnimationDelegate to the individual animation for a view // by way of SetAnimationDelegate. Additionally you can attach an observer to // the BoundsAnimator that is notified when all animations are complete. -class VIEWS_API BoundsAnimator : public ui::AnimationDelegate, - public ui::AnimationContainerObserver { +class VIEWS_EXPORT BoundsAnimator : public ui::AnimationDelegate, + public ui::AnimationContainerObserver { public: // If |delete_when_done| is set to true in |SetAnimationDelegate| the // |AnimationDelegate| must subclass this class. diff --git a/views/background.h b/views/background.h index 615b358..7bdd376 100644 --- a/views/background.h +++ b/views/background.h @@ -14,7 +14,7 @@ #include "base/basictypes.h" #include "third_party/skia/include/core/SkColor.h" -#include "views/views_api.h" +#include "views/views_export.h" namespace gfx { class Canvas; @@ -37,7 +37,7 @@ class View; // View::OnPaintBackground() // ///////////////////////////////////////////////////////////////////////////// -class VIEWS_API Background { +class VIEWS_EXPORT Background { public: Background(); virtual ~Background(); diff --git a/views/border.h b/views/border.h index 3d57c5d..27a46c6 100644 --- a/views/border.h +++ b/views/border.h @@ -34,7 +34,7 @@ class View; // //////////////////////////////////////////////////////////////////////////////// -class VIEWS_API Border { +class VIEWS_EXPORT Border { public: Border(); virtual ~Border(); diff --git a/views/context_menu_controller.h b/views/context_menu_controller.h index 123400d..9f0e6c4 100644 --- a/views/context_menu_controller.h +++ b/views/context_menu_controller.h @@ -6,7 +6,7 @@ #define VIEWS_CONTEXT_MENU_CONTROLLER_H_ #pragma once -#include "views/views_api.h" +#include "views/views_export.h" namespace gfx { class Point; @@ -26,7 +26,7 @@ class View; // It is up to subclasses that do their own mouse processing to invoke // the appropriate ContextMenuController method, typically by invoking super's // implementation for mouse processing. -class VIEWS_API ContextMenuController { +class VIEWS_EXPORT ContextMenuController { public: // Invoked to show the context menu for the source view. If |is_mouse_gesture| // is true, |p| is the location of the mouse. If |is_mouse_gesture| is false, 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(); diff --git a/views/drag_controller.h b/views/drag_controller.h index 5166556..1c74e26 100644 --- a/views/drag_controller.h +++ b/views/drag_controller.h @@ -6,7 +6,7 @@ #define VIEWS_EVENTS_DRAG_CONTROLLER_H_ #pragma once -#include "views/views_api.h" +#include "views/views_export.h" namespace gfx { class Point; @@ -22,7 +22,7 @@ class View; // DragController is responsible for writing drag data for a view, as well as // supplying the supported drag operations. Use DragController if you don't // want to subclass. -class VIEWS_API DragController { +class VIEWS_EXPORT DragController { public: // Writes the data for the drag. virtual void WriteDragDataForView(View* sender, diff --git a/views/drag_utils.h b/views/drag_utils.h index b7d743f..24c30c1 100644 --- a/views/drag_utils.h +++ b/views/drag_utils.h @@ -9,7 +9,7 @@ #include <string> #include "base/file_path.h" -#include "views/views_api.h" +#include "views/views_export.h" class GURL; class SkBitmap; @@ -29,34 +29,34 @@ namespace drag_utils { // Sets url and title on data as well as setting a suitable image for dragging. // The image looks like that of the bookmark buttons. -VIEWS_API void SetURLAndDragImage(const GURL& url, - const std::wstring& title, - const SkBitmap& icon, - OSExchangeData* data); +VIEWS_EXPORT void SetURLAndDragImage(const GURL& url, + const std::wstring& title, + const SkBitmap& icon, + OSExchangeData* data); // Creates a dragging image to be displayed when the user drags a file from // 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. -VIEWS_API void CreateDragImageForFile(const FilePath& file_name, - const SkBitmap* icon, - OSExchangeData* data_object); +VIEWS_EXPORT void CreateDragImageForFile(const FilePath& file_name, + const SkBitmap* icon, + 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. -VIEWS_API void SetDragImageOnDataObject(const gfx::Canvas& canvas, - const gfx::Size& size, - const gfx::Point& cursor_offset, - OSExchangeData* data_object); +VIEWS_EXPORT void SetDragImageOnDataObject(const gfx::Canvas& canvas, + const gfx::Size& size, + const gfx::Point& cursor_offset, + OSExchangeData* data_object); // Sets the drag image on data_object from the supplied bitmap. width/height // are the size of the image to use, and the offsets give the location of // the hotspot for the drag image. -VIEWS_API void SetDragImageOnDataObject(const SkBitmap& bitmap, - const gfx::Size& size, - const gfx::Point& cursor_offset, - OSExchangeData* data_object); +VIEWS_EXPORT void SetDragImageOnDataObject(const SkBitmap& bitmap, + const gfx::Size& size, + const gfx::Point& cursor_offset, + OSExchangeData* data_object); } // namespace drag_utils diff --git a/views/events/event.h b/views/events/event.h index c0fabbb..3278bc4 100644 --- a/views/events/event.h +++ b/views/events/event.h @@ -12,7 +12,7 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/gfx/point.h" #include "views/native_types.h" -#include "views/views_api.h" +#include "views/views_export.h" #if defined(USE_X11) typedef union _XEvent XEvent; @@ -33,8 +33,8 @@ class RootView; } #if defined(OS_WIN) -VIEWS_API bool IsClientMouseEvent(const views::NativeEvent& native_event); -VIEWS_API bool IsNonClientMouseEvent(const views::NativeEvent& native_event); +VIEWS_EXPORT bool IsClientMouseEvent(const views::NativeEvent& native_event); +VIEWS_EXPORT bool IsNonClientMouseEvent(const views::NativeEvent& native_event); #endif //////////////////////////////////////////////////////////////////////////////// @@ -49,7 +49,7 @@ VIEWS_API bool IsNonClientMouseEvent(const views::NativeEvent& native_event); // Events are immutable but support copy // //////////////////////////////////////////////////////////////////////////////// -class VIEWS_API Event { +class VIEWS_EXPORT Event { public: // This type exists to distinguish between the NativeEvent and NativeEvent2 // constructors. @@ -138,7 +138,7 @@ class VIEWS_API Event { // position in the screen. // //////////////////////////////////////////////////////////////////////////////// -class VIEWS_API LocatedEvent : public Event { +class VIEWS_EXPORT LocatedEvent : public Event { public: int x() const { return location_.x(); } int y() const { return location_.y(); } @@ -173,7 +173,7 @@ class TouchEvent; // A mouse event is used for any input event related to the mouse. // //////////////////////////////////////////////////////////////////////////////// -class VIEWS_API MouseEvent : public LocatedEvent { +class VIEWS_EXPORT MouseEvent : public LocatedEvent { public: explicit MouseEvent(NativeEvent native_event); MouseEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native); @@ -245,7 +245,7 @@ class VIEWS_API MouseEvent : public LocatedEvent { // TouchEvent and PlatformTouchPoint. // //////////////////////////////////////////////////////////////////////////////// -class VIEWS_API TouchEvent : public LocatedEvent { +class VIEWS_EXPORT TouchEvent : public LocatedEvent { public: TouchEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native); @@ -303,7 +303,7 @@ class VIEWS_API TouchEvent : public LocatedEvent { // KeyEvent encapsulates keyboard input events - key press and release. // //////////////////////////////////////////////////////////////////////////////// -class VIEWS_API KeyEvent : public Event { +class VIEWS_EXPORT KeyEvent : public Event { public: explicit KeyEvent(NativeEvent native_event); KeyEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native); @@ -376,7 +376,7 @@ class VIEWS_API KeyEvent : public Event { // Note: e.GetOffset() > 0 means scroll up / left. // //////////////////////////////////////////////////////////////////////////////// -class VIEWS_API MouseWheelEvent : public MouseEvent { +class VIEWS_EXPORT MouseWheelEvent : public MouseEvent { public: // See |offset| for details. static const int kWheelDelta; @@ -409,7 +409,7 @@ class VIEWS_API MouseWheelEvent : public MouseEvent { // drop operation. // //////////////////////////////////////////////////////////////////////////////// -class VIEWS_API DropTargetEvent : public LocatedEvent { +class VIEWS_EXPORT DropTargetEvent : public LocatedEvent { public: DropTargetEvent(const OSExchangeData& data, int x, diff --git a/views/events/event_utils_win.h b/views/events/event_utils_win.h index 258fa61..b11b45c 100644 --- a/views/events/event_utils_win.h +++ b/views/events/event_utils_win.h @@ -7,7 +7,7 @@ #pragma once #include "ui/gfx/native_widget_types.h" -#include "views/views_api.h" +#include "views/views_export.h" // Windows-specific Event utilities. Add functionality here rather than adding // #ifdefs to event.h @@ -24,7 +24,7 @@ int GetRepeatCount(const KeyEvent& event); // Returns true if the affected key is a Windows extended key. See documentation // for WM_KEYDOWN for explanation. // Valid only for KeyEvents constructed from a MSG. -VIEWS_API bool IsExtendedKey(const KeyEvent& event); +VIEWS_EXPORT bool IsExtendedKey(const KeyEvent& event); // Return a mask of windows key/button state flags for the event object. int GetWindowsFlags(const Event& event); diff --git a/views/focus/accelerator_handler.h b/views/focus/accelerator_handler.h index 7e17a42..b90bc84 100644 --- a/views/focus/accelerator_handler.h +++ b/views/focus/accelerator_handler.h @@ -16,23 +16,23 @@ #include <vector> #include "base/message_loop.h" -#include "views/views_api.h" +#include "views/views_export.h" namespace views { #if defined(TOUCH_UI) // Dispatch an XEvent to the RootView. Return true if the event was dispatched // and handled, false otherwise. -bool VIEWS_API DispatchXEvent(XEvent* xevent); +bool VIEWS_EXPORT DispatchXEvent(XEvent* xevent); // Keep a list of touch devices so that it is possible to determine if a pointer // event is a touch-event or a mouse-event. -void VIEWS_API SetTouchDeviceList(std::vector<unsigned int>& devices); +void VIEWS_EXPORT SetTouchDeviceList(std::vector<unsigned int>& devices); #endif // TOUCH_UI // This class delegates the key messages to the associated FocusManager class // for the window that is receiving these messages for accelerator processing. -class VIEWS_API AcceleratorHandler : public MessageLoop::Dispatcher { +class VIEWS_EXPORT AcceleratorHandler : public MessageLoop::Dispatcher { public: AcceleratorHandler(); diff --git a/views/focus/external_focus_tracker.h b/views/focus/external_focus_tracker.h index a4a12cf..7bce179 100644 --- a/views/focus/external_focus_tracker.h +++ b/views/focus/external_focus_tracker.h @@ -26,7 +26,7 @@ class ViewStorage; // when that view wants to return focus to the last focused view which is not // itself and not a descandant of itself, (usually when it is being closed) // it calls FocusLastFocusedExternalView. -class VIEWS_API ExternalFocusTracker : public FocusChangeListener { +class VIEWS_EXPORT ExternalFocusTracker : public FocusChangeListener { public: ExternalFocusTracker(View* parent_view, FocusManager* focus_manager); diff --git a/views/focus/focus_manager.h b/views/focus/focus_manager.h index ca31752..f2bf069 100644 --- a/views/focus/focus_manager.h +++ b/views/focus/focus_manager.h @@ -79,7 +79,7 @@ class Widget; // The FocusTraversable interface is used by components that want to process // focus traversal events (due to Tab/Shift-Tab key events). -class VIEWS_API FocusTraversable { +class VIEWS_EXPORT FocusTraversable { public: // Return a FocusSearch object that implements the algorithm to find // the next or previous focusable view. @@ -101,7 +101,7 @@ class VIEWS_API FocusTraversable { // This interface should be implemented by classes that want to be notified when // the focus is about to change. See the Add/RemoveFocusChangeListener methods. // No change to focus state has occurred yet when this function is called. -class VIEWS_API FocusChangeListener { +class VIEWS_EXPORT FocusChangeListener { public: virtual void FocusWillChange(View* focused_before, View* focused_now) = 0; @@ -123,9 +123,9 @@ class WidgetFocusChangeListener { virtual ~WidgetFocusChangeListener() {} }; -class VIEWS_API FocusManager { +class VIEWS_EXPORT FocusManager { public: - class VIEWS_API WidgetFocusManager { + class VIEWS_EXPORT WidgetFocusManager { public: // Returns the singleton instance. static WidgetFocusManager* GetInstance(); diff --git a/views/focus/focus_search.h b/views/focus/focus_search.h index 571982a..ae20a31 100644 --- a/views/focus/focus_search.h +++ b/views/focus/focus_search.h @@ -14,7 +14,7 @@ class FocusTraversable; // FocusSearch is an object that implements the algorithm to find the // next view to focus. -class VIEWS_API FocusSearch { +class VIEWS_EXPORT FocusSearch { public: // The direction in which the focus traversal is going. // TODO (jcampan): add support for lateral (left, right) focus traversal. The diff --git a/views/focus/focus_util_win.h b/views/focus/focus_util_win.h index 38f4626..b62e11f 100644 --- a/views/focus/focus_util_win.h +++ b/views/focus/focus_util_win.h @@ -8,7 +8,7 @@ #include <windows.h> -#include "views/views_api.h" +#include "views/views_export.h" namespace ui { class ViewProp; @@ -20,7 +20,7 @@ namespace views { // 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. -VIEWS_API ui::ViewProp* SetWindowSupportsRerouteMouseWheel(HWND hwnd); +VIEWS_EXPORT ui::ViewProp* SetWindowSupportsRerouteMouseWheel(HWND hwnd); // Forwards mouse wheel messages to the window under it. // Windows sends mouse wheel messages to the currently active window. @@ -29,7 +29,8 @@ VIEWS_API ui::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. -VIEWS_API bool RerouteMouseWheel(HWND window, WPARAM w_param, LPARAM l_param); +VIEWS_EXPORT bool RerouteMouseWheel(HWND window, WPARAM w_param, + LPARAM l_param); } // namespace views diff --git a/views/focus/view_storage.h b/views/focus/view_storage.h index 68ab960..8beb9e7 100644 --- a/views/focus/view_storage.h +++ b/views/focus/view_storage.h @@ -20,7 +20,7 @@ namespace views { -class VIEWS_API ViewStorage { +class VIEWS_EXPORT ViewStorage { public: // Returns the global ViewStorage instance. // It is guaranted to be non NULL. diff --git a/views/ime/input_method.h b/views/ime/input_method.h index 80924e0..3b37118 100644 --- a/views/ime/input_method.h +++ b/views/ime/input_method.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/i18n/rtl.h" #include "ui/base/ime/text_input_type.h" -#include "views/views_api.h" +#include "views/views_export.h" namespace views { @@ -31,7 +31,7 @@ class Widget; // And in Views control system, only the top-level NativeWidget has a native // window that can get keyboard focus. So this API is designed to be bound to // the top-level NativeWidget. -class VIEWS_API InputMethod { +class VIEWS_EXPORT InputMethod { public: virtual ~InputMethod() {} diff --git a/views/ime/input_method_base.h b/views/ime/input_method_base.h index c835a03..58e4a76 100644 --- a/views/ime/input_method_base.h +++ b/views/ime/input_method_base.h @@ -19,8 +19,8 @@ class View; // A helper class providing functionalities shared among InputMethod // implementations. -class VIEWS_API InputMethodBase : public InputMethod, - public FocusChangeListener { +class VIEWS_EXPORT InputMethodBase : public InputMethod, + public FocusChangeListener { public: InputMethodBase(); virtual ~InputMethodBase(); diff --git a/views/ime/input_method_delegate.h b/views/ime/input_method_delegate.h index c683c65..32ce033 100644 --- a/views/ime/input_method_delegate.h +++ b/views/ime/input_method_delegate.h @@ -6,7 +6,7 @@ #define VIEWS_IME_INPUT_METHOD_DELEGATE_H_ #pragma once -#include "views/views_api.h" +#include "views/views_export.h" namespace views { @@ -16,7 +16,7 @@ namespace internal { // An interface implemented by the object that handles events sent back from an // InputMethod implementation. -class VIEWS_API InputMethodDelegate { +class VIEWS_EXPORT InputMethodDelegate { public: virtual ~InputMethodDelegate() {} diff --git a/views/ime/mock_input_method.h b/views/ime/mock_input_method.h index a364636..b61d4e6 100644 --- a/views/ime/mock_input_method.h +++ b/views/ime/mock_input_method.h @@ -14,7 +14,7 @@ namespace views { // A mock InputMethod implementation for testing purpose. -class VIEWS_API MockInputMethod : public InputMethodBase { +class VIEWS_EXPORT MockInputMethod : public InputMethodBase { public: MockInputMethod(); explicit MockInputMethod(internal::InputMethodDelegate* delegate); diff --git a/views/ime/text_input_client.h b/views/ime/text_input_client.h index b626479..a67214f 100644 --- a/views/ime/text_input_client.h +++ b/views/ime/text_input_client.h @@ -14,7 +14,7 @@ #include "ui/base/ime/composition_text.h" #include "ui/base/ime/text_input_type.h" #include "ui/base/range/range.h" -#include "views/views_api.h" +#include "views/views_export.h" namespace gfx { class Rect; @@ -25,7 +25,7 @@ namespace views { class View; // An interface implemented by a View that needs text input support. -class VIEWS_API TextInputClient { +class VIEWS_EXPORT TextInputClient { public: virtual ~TextInputClient() {} diff --git a/views/layer_property_setter.h b/views/layer_property_setter.h index da34c6c..07f4abd 100644 --- a/views/layer_property_setter.h +++ b/views/layer_property_setter.h @@ -6,7 +6,7 @@ #define UI_GFX_COMPOSITOR_LAYER_PROPERTY_SETTER_H_ #pragma once -#include "views/views_api.h" +#include "views/views_export.h" namespace gfx { class Rect; @@ -22,7 +22,7 @@ namespace views { // When a property of layer needs to be changed it is set by way of // LayerPropertySetter. This enables LayerPropertySetter to animate property // changes. -class VIEWS_API LayerPropertySetter { +class VIEWS_EXPORT LayerPropertySetter { public: // Creates a LayerPropertySetter that immediately sets the values on the // layer. Ownership returns to caller. diff --git a/views/layout/box_layout.h b/views/layout/box_layout.h index e8798f7..2422bb6 100644 --- a/views/layout/box_layout.h +++ b/views/layout/box_layout.h @@ -23,7 +23,7 @@ class View; // child views are always sized according to their preferred size. If the // host's bounds provide insufficient space, child views will be clamped. // Excess space will not be distributed. -class VIEWS_API BoxLayout : public LayoutManager { +class VIEWS_EXPORT BoxLayout : public LayoutManager { public: enum Orientation { kHorizontal, diff --git a/views/layout/fill_layout.h b/views/layout/fill_layout.h index b9451a3..20e989f 100644 --- a/views/layout/fill_layout.h +++ b/views/layout/fill_layout.h @@ -18,7 +18,7 @@ namespace views { // sized to match the bounds of its parent. // /////////////////////////////////////////////////////////////////////////////// -class VIEWS_API FillLayout : public LayoutManager { +class VIEWS_EXPORT FillLayout : public LayoutManager { public: FillLayout(); virtual ~FillLayout(); diff --git a/views/layout/grid_layout.h b/views/layout/grid_layout.h index 062ce8d..ddfaf8e 100644 --- a/views/layout/grid_layout.h +++ b/views/layout/grid_layout.h @@ -70,7 +70,7 @@ class View; struct ViewState; -class VIEWS_API GridLayout : public LayoutManager { +class VIEWS_EXPORT GridLayout : public LayoutManager { public: // An enumeration of the possible alignments supported by GridLayout. enum Alignment { @@ -262,7 +262,7 @@ class VIEWS_API GridLayout : public LayoutManager { // ColumnSet is used to define a set of columns. GridLayout may have any // number of ColumnSets. You don't create a ColumnSet directly, instead // use the AddColumnSet method of GridLayout. -class VIEWS_API ColumnSet { +class VIEWS_EXPORT ColumnSet { public: ~ColumnSet(); diff --git a/views/layout/layout_manager.h b/views/layout/layout_manager.h index 0fb395a..b34499c 100644 --- a/views/layout/layout_manager.h +++ b/views/layout/layout_manager.h @@ -6,7 +6,7 @@ #define VIEWS_LAYOUT_MANAGER_H_ #pragma once -#include "views/views_api.h" +#include "views/views_export.h" namespace gfx { class Size; @@ -24,7 +24,7 @@ class View; // the children of a View according to implementation-specific heuristics. // ///////////////////////////////////////////////////////////////////////////// -class VIEWS_API LayoutManager { +class VIEWS_EXPORT LayoutManager { public: virtual ~LayoutManager(); diff --git a/views/metrics.h b/views/metrics.h index 3558a09..bcb7cdd 100644 --- a/views/metrics.h +++ b/views/metrics.h @@ -6,7 +6,7 @@ #define VIEWS_METRICS_H_ #pragma once -#include "views/views_api.h" +#include "views/views_export.h" namespace views { @@ -17,11 +17,11 @@ namespace views { extern const int kDefaultMenuShowDelay; // Returns the amount of time between double clicks. -VIEWS_API int GetDoubleClickInterval(); +VIEWS_EXPORT int GetDoubleClickInterval(); // Returns the amount of time to wait from hovering over a menu button until // showing the menu. -VIEWS_API int GetMenuShowDelay(); +VIEWS_EXPORT int GetMenuShowDelay(); } // namespace views diff --git a/views/mouse_watcher.h b/views/mouse_watcher.h index c7a270c..753f323 100644 --- a/views/mouse_watcher.h +++ b/views/mouse_watcher.h @@ -9,14 +9,14 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/insets.h" -#include "views/views_api.h" +#include "views/views_export.h" namespace views { class View; // MouseWatcherListener is notified when the mouse moves outside the view. -class VIEWS_API MouseWatcherListener { +class VIEWS_EXPORT MouseWatcherListener { public: virtual void MouseMovedOutOfView() = 0; @@ -26,7 +26,7 @@ class VIEWS_API MouseWatcherListener { // MouseWatcher is used to watch mouse movement and notify its listener when the // mouse moves outside the bounds of a view. -class VIEWS_API MouseWatcher { +class VIEWS_EXPORT MouseWatcher { public: // Creates a new MouseWatcher. |hot_zone_insets| is added to the bounds of // the view to determine the active zone. For example, if diff --git a/views/native_theme_delegate.h b/views/native_theme_delegate.h index 9ae390f..3ebd4f7 100644 --- a/views/native_theme_delegate.h +++ b/views/native_theme_delegate.h @@ -8,7 +8,7 @@ #include "ui/gfx/native_theme.h" #include "ui/gfx/rect.h" -#include "views/views_api.h" +#include "views/views_export.h" namespace views { @@ -19,7 +19,7 @@ namespace views { // If animation is onging, the native theme border or painter will // composite the foreground state over the backgroud state using an alpha // between 0 and 255 based on the current value of the animation. -class VIEWS_API NativeThemeDelegate { +class VIEWS_EXPORT NativeThemeDelegate { public: virtual ~NativeThemeDelegate() {} diff --git a/views/native_theme_painter.h b/views/native_theme_painter.h index c1d6c23..5e69aeb 100644 --- a/views/native_theme_painter.h +++ b/views/native_theme_painter.h @@ -25,7 +25,7 @@ class NativeThemeDelegate; // A Painter that uses NativeTheme to implement painting and sizing. A // theme delegate must be given at construction time so that the appropriate // painting and sizing can be done. -class VIEWS_API NativeThemePainter : public Painter { +class VIEWS_EXPORT NativeThemePainter : public Painter { public: explicit NativeThemePainter(NativeThemeDelegate* delegate); diff --git a/views/painter.h b/views/painter.h index 45cab2b2..50c950b 100644 --- a/views/painter.h +++ b/views/painter.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "third_party/skia/include/core/SkColor.h" -#include "views/views_api.h" +#include "views/views_export.h" namespace gfx { class Canvas; @@ -21,7 +21,7 @@ namespace views { // Painter, as the name implies, is responsible for painting in a particular // region. Think of Painter as a Border or Background that can be painted // in any region of a View. -class VIEWS_API Painter { +class VIEWS_EXPORT Painter { public: // A convenience method for painting a Painter in a particular region. // This translates the canvas to x/y and paints the painter. @@ -52,7 +52,7 @@ class VIEWS_API Painter { // left and right images are drawn to size at the left/right edges of the // region. The center is tiled in the remaining space. All images must have the // same height. -class VIEWS_API HorizontalPainter : public Painter { +class VIEWS_EXPORT HorizontalPainter : public Painter { public: // Constructs a new HorizontalPainter loading the specified image names. // The images must be in the order left, right and center. diff --git a/views/touchui/gesture_manager.h b/views/touchui/gesture_manager.h index 22693f7..12fee961b7 100644 --- a/views/touchui/gesture_manager.h +++ b/views/touchui/gesture_manager.h @@ -22,7 +22,7 @@ class TouchEvent; // updates its internal state and optionally dispatches synthetic // events to the invoking view. // -class VIEWS_API GestureManager { +class VIEWS_EXPORT GestureManager { public: virtual ~GestureManager(); diff --git a/views/touchui/touch_factory.h b/views/touchui/touch_factory.h index 4792dd6..b18d8c3 100644 --- a/views/touchui/touch_factory.h +++ b/views/touchui/touch_factory.h @@ -11,7 +11,7 @@ #include "base/memory/singleton.h" #include "base/timer.h" -#include "views/views_api.h" +#include "views/views_export.h" typedef unsigned long Cursor; typedef unsigned long Window; @@ -21,7 +21,7 @@ typedef union _XEvent XEvent; namespace views { // Functions related to determining touch devices. -class VIEWS_API TouchFactory { +class VIEWS_EXPORT TouchFactory { public: // Define the touch params following the Multi-touch Protocol. enum TouchParam { diff --git a/views/touchui/touch_selection_controller.h b/views/touchui/touch_selection_controller.h index ce028e0..58f6f91 100644 --- a/views/touchui/touch_selection_controller.h +++ b/views/touchui/touch_selection_controller.h @@ -13,7 +13,7 @@ namespace views { // An interface implemented by a View that has text that can be selected. -class VIEWS_API TouchSelectionClientView +class VIEWS_EXPORT TouchSelectionClientView : public View, public ui::SimpleMenuModel::Delegate { public: @@ -28,7 +28,7 @@ class VIEWS_API TouchSelectionClientView // This defines the callback interface for other code to be notified of changes // in the state of a TouchSelectionClientView. -class VIEWS_API TouchSelectionController { +class VIEWS_EXPORT TouchSelectionController { public: virtual ~TouchSelectionController() {} diff --git a/views/view.h b/views/view.h index 779059d..c188531 100644 --- a/views/view.h +++ b/views/view.h @@ -91,7 +91,7 @@ class RootView; // accessed from the main thread. // ///////////////////////////////////////////////////////////////////////////// -class VIEWS_API View : public AcceleratorTarget { +class VIEWS_EXPORT View : public AcceleratorTarget { public: typedef std::vector<View*> Views; diff --git a/views/view_constants.h b/views/view_constants.h index ffdf7a0..c00fe32 100644 --- a/views/view_constants.h +++ b/views/view_constants.h @@ -6,7 +6,7 @@ #define VIEWS_VIEW_CONSTANTS_H_ #pragma once -#include "views/views_api.h" +#include "views/views_export.h" namespace views { @@ -21,7 +21,7 @@ extern const int kAutoscrollRowTimerMS; // Used to determine whether a drop is on an item or before/after it. If a drop // occurs kDropBetweenPixels from the top/bottom it is considered before/after // the item, otherwise it is on the item. -VIEWS_API extern const int kDropBetweenPixels; +VIEWS_EXPORT extern const int kDropBetweenPixels; } // namespace views diff --git a/views/view_text_utils.h b/views/view_text_utils.h index cc30220..27ab5d3 100644 --- a/views/view_text_utils.h +++ b/views/view_text_utils.h @@ -12,7 +12,7 @@ #include "ui/gfx/font.h" #include "ui/gfx/rect.h" -#include "views/views_api.h" +#include "views/views_export.h" namespace gfx { class Canvas; @@ -40,15 +40,15 @@ namespace view_text_utils { // NOTE: The reason why we need this function is because while Skia knows how // to wrap text appropriately, it doesn't tell us where it drew the last // character, which we need to position the URLs within the text. -VIEWS_API void DrawTextAndPositionUrl(gfx::Canvas* canvas, - views::Label* label, - const std::wstring& text, - views::Link* link, - gfx::Rect* rect, - gfx::Size* position, - bool text_direction_is_rtl, - const gfx::Rect& bounds, - const gfx::Font& font); +VIEWS_EXPORT void DrawTextAndPositionUrl(gfx::Canvas* canvas, + views::Label* label, + const std::wstring& text, + views::Link* link, + gfx::Rect* rect, + gfx::Size* position, + bool text_direction_is_rtl, + const gfx::Rect& bounds, + const gfx::Font& font); // A helper function for DrawTextAndPositionUrl, which simply draws the text // from a certain starting point |position| and wraps within bounds. diff --git a/views/views_api.h b/views/views_api.h deleted file mode 100644 index 7d6278d..0000000 --- a/views/views_api.h +++ /dev/null @@ -1,29 +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 VIEWS_VIEWS_API_H_ -#define VIEWS_VIEWS_API_H_ -#pragma once - -// Defines VIEWS_API so that funtionality implemented by the UI module can be -// exported to consumers. - -#if defined(COMPONENT_BUILD) -#if defined(WIN32) - -#if defined(VIEWS_IMPLEMENTATION) -#define VIEWS_API __declspec(dllexport) -#else -#define VIEWS_API __declspec(dllimport) -#endif // defined(VIEWS_IMPLEMENTATION) - -#else // defined(WIN32) -#define VIEWS_API __attribute__((visibility("default"))) -#endif - -#else /// defined(COMPONENT_BUILD) -#define VIEWS_API -#endif - -#endif // UI_UI_API_H_ diff --git a/views/views_delegate.h b/views/views_delegate.h index e162389..13baff0 100644 --- a/views/views_delegate.h +++ b/views/views_delegate.h @@ -12,7 +12,7 @@ #endif #include "ui/base/accessibility/accessibility_types.h" -#include "views/views_api.h" +#include "views/views_export.h" namespace gfx { class Rect; @@ -33,7 +33,7 @@ class Widget; // // The embedding app must set views_delegate to assign its ViewsDelegate // implementation. -class VIEWS_API ViewsDelegate { +class VIEWS_EXPORT ViewsDelegate { public: virtual ~ViewsDelegate() {} diff --git a/views/views_export.h b/views/views_export.h new file mode 100644 index 0000000..b38c8ed --- /dev/null +++ b/views/views_export.h @@ -0,0 +1,29 @@ +// 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 VIEWS_VIEWS_EXPORT_H_ +#define VIEWS_VIEWS_EXPORT_H_ +#pragma once + +// Defines VIEWS_EXPORT so that functionality implemented by the Views module +// can be exported to consumers. + +#if defined(COMPONENT_BUILD) +#if defined(WIN32) + +#if defined(VIEWS_IMPLEMENTATION) +#define VIEWS_EXPORT __declspec(dllexport) +#else +#define VIEWS_EXPORT __declspec(dllimport) +#endif // defined(VIEWS_IMPLEMENTATION) + +#else // defined(WIN32) +#define VIEWS_EXPORT __attribute__((visibility("default"))) +#endif + +#else // defined(COMPONENT_BUILD) +#define VIEWS_EXPORT +#endif + +#endif // UI_UI_EXPORT_H_ diff --git a/views/widget/default_theme_provider.h b/views/widget/default_theme_provider.h index 3b96e32..9303e83 100644 --- a/views/widget/default_theme_provider.h +++ b/views/widget/default_theme_provider.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "ui/base/theme_provider.h" -#include "views/views_api.h" +#include "views/views_export.h" class Profile; @@ -21,7 +21,7 @@ using ui::ResourceBundle; namespace views { -class VIEWS_API DefaultThemeProvider : public ui::ThemeProvider { +class VIEWS_EXPORT DefaultThemeProvider : public ui::ThemeProvider { public: DefaultThemeProvider(); virtual ~DefaultThemeProvider(); diff --git a/views/widget/monitor_win.h b/views/widget/monitor_win.h index e50ab89..ac92f9b 100644 --- a/views/widget/monitor_win.h +++ b/views/widget/monitor_win.h @@ -6,7 +6,7 @@ #define VIEWS_WIDGET_MONITOR_WIN_H_ #pragma once -#include "views/views_api.h" +#include "views/views_export.h" namespace gfx { class Rect; @@ -16,7 +16,7 @@ namespace views { // Returns the bounds for the monitor that contains the largest area of // intersection with the specified rectangle. -VIEWS_API gfx::Rect GetMonitorBoundsForRect(const gfx::Rect& rect); +VIEWS_EXPORT gfx::Rect GetMonitorBoundsForRect(const gfx::Rect& rect); } // namespace views diff --git a/views/widget/native_widget.h b/views/widget/native_widget.h index 866598e..9289fde 100644 --- a/views/widget/native_widget.h +++ b/views/widget/native_widget.h @@ -23,7 +23,7 @@ class NativeWidgetPrivate; // Widget's native_widget() accessor, which code occasionally static_casts to // a known implementation in platform-specific code. // -class VIEWS_API NativeWidget { +class VIEWS_EXPORT NativeWidget { public: virtual ~NativeWidget() {} diff --git a/views/widget/native_widget_delegate.h b/views/widget/native_widget_delegate.h index 7da3cc7..bfd0705 100644 --- a/views/widget/native_widget_delegate.h +++ b/views/widget/native_widget_delegate.h @@ -6,7 +6,7 @@ #define VIEWS_WIDGET_NATIVE_WIDGET_DELEGATE_H_ #pragma once -#include "views/views_api.h" +#include "views/views_export.h" namespace gfx { class Canvas; @@ -28,7 +28,7 @@ namespace internal { // An interface implemented by the object that handles events sent by a // NativeWidget implementation. // -class VIEWS_API NativeWidgetDelegate { +class VIEWS_EXPORT NativeWidgetDelegate { public: virtual ~NativeWidgetDelegate() {} diff --git a/views/widget/native_widget_gtk.h b/views/widget/native_widget_gtk.h index a747db3..8c9b3fa 100644 --- a/views/widget/native_widget_gtk.h +++ b/views/widget/native_widget_gtk.h @@ -41,9 +41,9 @@ class NativeWidgetDelegate; } // Widget implementation for GTK. -class VIEWS_API NativeWidgetGtk : public internal::NativeWidgetPrivate, - public ui::ActiveWindowWatcherX::Observer, - public internal::InputMethodDelegate { +class VIEWS_EXPORT NativeWidgetGtk : public internal::NativeWidgetPrivate, + public ui::ActiveWindowWatcherX::Observer, + public internal::InputMethodDelegate { public: explicit NativeWidgetGtk(internal::NativeWidgetDelegate* delegate); virtual ~NativeWidgetGtk(); diff --git a/views/widget/native_widget_private.h b/views/widget/native_widget_private.h index 0c40fbf..3846b34 100644 --- a/views/widget/native_widget_private.h +++ b/views/widget/native_widget_private.h @@ -36,7 +36,7 @@ namespace internal { // NativeWidget implementations. This file should not be included // in code that does not fall into one of these use cases. // -class VIEWS_API NativeWidgetPrivate : public NativeWidget { +class VIEWS_EXPORT NativeWidgetPrivate : public NativeWidget { public: virtual ~NativeWidgetPrivate() {} diff --git a/views/widget/native_widget_view.h b/views/widget/native_widget_view.h index 2f86edc..0a729a0 100644 --- a/views/widget/native_widget_view.h +++ b/views/widget/native_widget_view.h @@ -27,7 +27,7 @@ namespace internal { // View hierarchy. It is responsible for receiving relevant events from that // hierarchy and forwarding them to its NativeWidgetViews' delegate's hierarchy. // -class VIEWS_API NativeWidgetView : public View { +class VIEWS_EXPORT NativeWidgetView : public View { public: static const char kViewClassName[]; diff --git a/views/widget/native_widget_views.h b/views/widget/native_widget_views.h index ed46fb2..e8efe3c1 100644 --- a/views/widget/native_widget_views.h +++ b/views/widget/native_widget_views.h @@ -23,8 +23,8 @@ class NativeWidgetView; // // A NativeWidget implementation that uses another View as its native widget. // -class VIEWS_API NativeWidgetViews : public internal::NativeWidgetPrivate, - public internal::InputMethodDelegate { +class VIEWS_EXPORT NativeWidgetViews : public internal::NativeWidgetPrivate, + public internal::InputMethodDelegate { public: explicit NativeWidgetViews(internal::NativeWidgetDelegate* delegate); virtual ~NativeWidgetViews(); diff --git a/views/widget/native_widget_win.h b/views/widget/native_widget_win.h index c4b5916..1551f35 100644 --- a/views/widget/native_widget_win.h +++ b/views/widget/native_widget_win.h @@ -48,9 +48,9 @@ class NativeWidgetDelegate; // This is exposed only for testing // Adjusts the value of |child_rect| if necessary to ensure that it is // completely visible within |parent_rect|. -VIEWS_API void EnsureRectIsVisibleInRect(const gfx::Rect& parent_rect, - gfx::Rect* child_rect, - int padding); +VIEWS_EXPORT void EnsureRectIsVisibleInRect(const gfx::Rect& parent_rect, + gfx::Rect* child_rect, + int padding); } // namespace internal // A Windows message reflected from other windows. This message is sent @@ -85,10 +85,10 @@ const int WM_NCUAHDRAWFRAME = 0xAF; // then responsible for cleaning up after it. // /////////////////////////////////////////////////////////////////////////////// -class VIEWS_API NativeWidgetWin : public ui::WindowImpl, - public internal::NativeWidgetPrivate, - public MessageLoopForUI::Observer, - public internal::InputMethodDelegate { +class VIEWS_EXPORT NativeWidgetWin : public ui::WindowImpl, + public internal::NativeWidgetPrivate, + public MessageLoopForUI::Observer, + public internal::InputMethodDelegate { public: explicit NativeWidgetWin(internal::NativeWidgetDelegate* delegate); virtual ~NativeWidgetWin(); diff --git a/views/widget/root_view.h b/views/widget/root_view.h index 0dde54c..a02b5d3 100644 --- a/views/widget/root_view.h +++ b/views/widget/root_view.h @@ -43,7 +43,7 @@ namespace internal { // TODO(beng): Clean up API further, make Widget a friend. // TODO(sky): We don't really want to export this class. // -class VIEWS_API RootView : public View, public FocusTraversable { +class VIEWS_EXPORT RootView : public View, public FocusTraversable { public: static const char kViewClassName[]; diff --git a/views/widget/tooltip_manager.h b/views/widget/tooltip_manager.h index 28ca52d..46b379b 100644 --- a/views/widget/tooltip_manager.h +++ b/views/widget/tooltip_manager.h @@ -9,7 +9,7 @@ #include <string> #include "base/basictypes.h" -#include "views/views_api.h" +#include "views/views_export.h" namespace gfx { class Font; @@ -22,7 +22,7 @@ class View; // TooltipManager takes care of the wiring to support tooltips for Views. You // almost never need to interact directly with TooltipManager, rather look to // the various tooltip methods on View. -class VIEWS_API TooltipManager { +class VIEWS_EXPORT TooltipManager { public: // Returns the height of tooltips. This should only be invoked from within // GetTooltipTextOrigin. diff --git a/views/widget/tooltip_window_gtk.h b/views/widget/tooltip_window_gtk.h index 01c7397..0ca234f 100644 --- a/views/widget/tooltip_window_gtk.h +++ b/views/widget/tooltip_window_gtk.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "ui/base/gtk/gtk_integers.h" #include "ui/base/gtk/gtk_signal.h" -#include "views/views_api.h" +#include "views/views_export.h" typedef struct _GdkEventExpose GdkEventExpose; typedef struct _GtkLabel GtkLabel; @@ -23,7 +23,7 @@ namespace views { // TooltipWindowGtk provides a customized tooltip window and gives us a // chance to apply RGBA colormap on it. This enables the GTK theme engine to // draw tooltip with nice shadow and rounded corner on ChromeOS. -class VIEWS_API TooltipWindowGtk { +class VIEWS_EXPORT TooltipWindowGtk { public: explicit TooltipWindowGtk(GtkWidget* widget); virtual ~TooltipWindowGtk(); diff --git a/views/widget/widget.h b/views/widget/widget.h index 9af6481..24278a4 100644 --- a/views/widget/widget.h +++ b/views/widget/widget.h @@ -87,8 +87,8 @@ class RootView; // the Widget it is responsible for destroying the NativeWidget (from its // destructor). // -class VIEWS_API Widget : public internal::NativeWidgetDelegate, - public FocusTraversable { +class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, + public FocusTraversable { public: // Observers can listen to various events on the Widgets. class Observer { @@ -106,7 +106,7 @@ class VIEWS_API Widget : public internal::NativeWidgetDelegate, FRAME_TYPE_FORCE_NATIVE // Force the native frame. }; - struct VIEWS_API InitParams { + struct VIEWS_EXPORT InitParams { enum Type { TYPE_WINDOW, // A decorated Window, like a frame window. // Widgets of TYPE_WINDOW will have a NonClientView. diff --git a/views/widget/widget_delegate.h b/views/widget/widget_delegate.h index 450aba7..85485e6 100644 --- a/views/widget/widget_delegate.h +++ b/views/widget/widget_delegate.h @@ -27,7 +27,7 @@ class Widget; // WidgetDelegate interface // Handles events on Widgets in context-specific ways. -class VIEWS_API WidgetDelegate { +class VIEWS_EXPORT WidgetDelegate { public: WidgetDelegate(); @@ -159,7 +159,7 @@ class VIEWS_API WidgetDelegate { // A WidgetDelegate implementation that is-a View. Used to override GetWidget() // to call View's GetWidget() for the common case where a WidgetDelegate // implementation is-a View. -class VIEWS_API WidgetDelegateView : public WidgetDelegate, public View { +class VIEWS_EXPORT WidgetDelegateView : public WidgetDelegate, public View { public: WidgetDelegateView(); virtual ~WidgetDelegateView(); diff --git a/views/window/client_view.h b/views/window/client_view.h index 9e85cba..8667a0e 100644 --- a/views/window/client_view.h +++ b/views/window/client_view.h @@ -21,7 +21,7 @@ class Widget; // such as non-client hit testing information, sizing etc. Sub-classes of // ClientView are used to create more elaborate contents, e.g. // "DialogClientView". -class VIEWS_API ClientView : public View { +class VIEWS_EXPORT ClientView : public View { public: // Internal class name static const char kViewClassName[]; diff --git a/views/window/dialog_client_view.h b/views/window/dialog_client_view.h index 4be8460..928ce57 100644 --- a/views/window/dialog_client_view.h +++ b/views/window/dialog_client_view.h @@ -32,9 +32,9 @@ class RootView; // DialogClientView also provides the ability to set an arbitrary view that is // positioned beneath the buttons. // -class VIEWS_API DialogClientView : public ClientView, - public ButtonListener, - public FocusChangeListener { +class VIEWS_EXPORT DialogClientView : public ClientView, + public ButtonListener, + public FocusChangeListener { public: DialogClientView(Widget* widget, View* contents_view); virtual ~DialogClientView(); diff --git a/views/window/dialog_delegate.h b/views/window/dialog_delegate.h index 0363cbb..629d290 100644 --- a/views/window/dialog_delegate.h +++ b/views/window/dialog_delegate.h @@ -27,7 +27,7 @@ class View; // certain events. // /////////////////////////////////////////////////////////////////////////////// -class VIEWS_API DialogDelegate : public WidgetDelegate { +class VIEWS_EXPORT DialogDelegate : public WidgetDelegate { public: virtual DialogDelegate* AsDialogDelegate(); @@ -115,8 +115,8 @@ class VIEWS_API DialogDelegate : public WidgetDelegate { // A DialogDelegate implementation that is-a View. Used to override GetWidget() // to call View's GetWidget() for the common case where a DialogDelegate // implementation is-a View. -class VIEWS_API DialogDelegateView : public DialogDelegate, - public View { +class VIEWS_EXPORT DialogDelegateView : public DialogDelegate, + public View { public: DialogDelegateView(); virtual ~DialogDelegateView(); diff --git a/views/window/native_frame_view.h b/views/window/native_frame_view.h index 4743681..2073def 100644 --- a/views/window/native_frame_view.h +++ b/views/window/native_frame_view.h @@ -12,7 +12,7 @@ namespace views { class Widget; -class VIEWS_API NativeFrameView : public NonClientFrameView { +class VIEWS_EXPORT NativeFrameView : public NonClientFrameView { public: explicit NativeFrameView(Widget* frame); virtual ~NativeFrameView(); diff --git a/views/window/non_client_view.h b/views/window/non_client_view.h index 27fa9e7..48f0224 100644 --- a/views/window/non_client_view.h +++ b/views/window/non_client_view.h @@ -23,7 +23,7 @@ namespace views { // responds to events within the frame portions of the non-client area of a // window. This view does _not_ contain the ClientView, but rather is a sibling // of it. -class VIEWS_API NonClientFrameView : public View { +class VIEWS_EXPORT NonClientFrameView : public View { public: // Internal class name. static const char kViewClassName[]; @@ -131,7 +131,7 @@ class VIEWS_API NonClientFrameView : public View { // implementations (e.g. during the switch from DWM/Aero-Glass to Vista Basic/ // Classic rendering). // -class VIEWS_API NonClientView : public View { +class VIEWS_EXPORT NonClientView : public View { public: // Internal class name. static const char kViewClassName[]; diff --git a/views/window/window_shape.h b/views/window/window_shape.h index 0238b71..d3ee7b6 100644 --- a/views/window/window_shape.h +++ b/views/window/window_shape.h @@ -6,7 +6,7 @@ #define VIEWS_WINDOW_WINDOW_SHAPE_H_ #pragma once -#include "views/views_api.h" +#include "views/views_export.h" namespace gfx { class Size; @@ -17,8 +17,8 @@ namespace views { // Sets the window mask to a style that most likely matches // ui/resources/window_* -VIEWS_API void GetDefaultWindowMask(const gfx::Size& size, - gfx::Path* window_mask); +VIEWS_EXPORT void GetDefaultWindowMask(const gfx::Size& size, + gfx::Path* window_mask); } // namespace views |