summaryrefslogtreecommitdiffstats
path: root/views/focus
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-05 20:58:29 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-05 20:58:29 +0000
commit5036f187c5431c1afc5bac442e1d74390d7a3fa0 (patch)
treeaf465cf27c50860ca7773876ac7bf08b6b653875 /views/focus
parent26c740c8fb36d3e59200cfab668eb9c5f7539d11 (diff)
downloadchromium_src-5036f187c5431c1afc5bac442e1d74390d7a3fa0.zip
chromium_src-5036f187c5431c1afc5bac442e1d74390d7a3fa0.tar.gz
chromium_src-5036f187c5431c1afc5bac442e1d74390d7a3fa0.tar.bz2
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
Diffstat (limited to 'views/focus')
-rw-r--r--views/focus/accelerator_handler.h8
-rw-r--r--views/focus/external_focus_tracker.h2
-rw-r--r--views/focus/focus_manager.h8
-rw-r--r--views/focus/focus_search.h2
-rw-r--r--views/focus/focus_util_win.h7
-rw-r--r--views/focus/view_storage.h2
6 files changed, 15 insertions, 14 deletions
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.