summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-17 01:29:20 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-17 01:29:20 +0000
commit5b08b5473588d173ad029c6f99f8ea39966323a8 (patch)
treebbdacfbdab7044f255a20a1faed5422dc167c37b
parentf8d6ce14a7ba737ab70a02bc7e516091121078ee (diff)
downloadchromium_src-5b08b5473588d173ad029c6f99f8ea39966323a8.zip
chromium_src-5b08b5473588d173ad029c6f99f8ea39966323a8.tar.gz
chromium_src-5b08b5473588d173ad029c6f99f8ea39966323a8.tar.bz2
Revert 157057 - views/examples: ShowExamplesWindow() should be exported.
views_examples_lib is a component target now, so in order to make it work in shared_library builds, ShowExamplesWindow() function needs to be exported. E:\b\build\slave\win\build\src\ui\views\examples\examples_window.cc(194) : error C2220: warning treated as error - no 'object' file generated E:\b\build\slave\win\build\src\ui\views\examples\examples_window.cc(194) : warning C4273: 'views::examples::ShowExamplesWindow' : inconsistent dll linkage ..\..\ui/views/examples/examples_window.h(19) : see previous definition of 'ShowExamplesWindow' We need to have another define for VIEWS_EXAMPLES_IMPLEMENTATION and views_examples_export.h BUG=141187 TBR=ben@chromium.org Review URL: https://codereview.chromium.org/10911328 TBR=tfarina@chromium.org Review URL: https://codereview.chromium.org/10933115 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157063 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ui/views/examples/examples_window.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/ui/views/examples/examples_window.h b/ui/views/examples/examples_window.h
index a3bc760..a3fc4e5 100644
--- a/ui/views/examples/examples_window.h
+++ b/ui/views/examples/examples_window.h
@@ -5,8 +5,6 @@
#ifndef UI_VIEWS_EXAMPLES_EXAMPLES_WINDOW_H_
#define UI_VIEWS_EXAMPLES_EXAMPLES_WINDOW_H_
-#include "ui/views/views_export.h"
-
namespace views {
namespace examples {
@@ -16,7 +14,7 @@ enum Operation {
};
// Shows a window with the views examples in it.
-VIEWS_EXPORT void ShowExamplesWindow(Operation operation);
+void ShowExamplesWindow(Operation operation);
} // namespace examples
} // namespace views