From 6827766b1fcc5885b7a8bc8c707e283f71f46f09 Mon Sep 17 00:00:00 2001
From: "darin@chromium.org"
 <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 28 Jul 2011 06:32:33 +0000
Subject: Create views.dll / libviews.so

R=sky@chromium.org,rvargas@chromium.org
Review URL: http://codereview.chromium.org/7493017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94428 0039d316-1c4b-4281-b951-d872f2087c98
---
 views/controls/combobox/combobox.h                        | 14 ++++----------
 views/controls/combobox/native_combobox_views_unittest.cc |  4 ++--
 views/controls/combobox/native_combobox_wrapper.h         |  3 ++-
 3 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'views/controls/combobox')

diff --git a/views/controls/combobox/combobox.h b/views/controls/combobox/combobox.h
index 483238d..6a472b5 100644
--- a/views/controls/combobox/combobox.h
+++ b/views/controls/combobox/combobox.h
@@ -8,12 +8,9 @@
 
 #include <string>
 
-#include "views/view.h"
-
-#ifdef UNIT_TEST
 #include "ui/gfx/native_widget_types.h"
 #include "views/controls/combobox/native_combobox_wrapper.h"
-#endif
+#include "views/view.h"
 
 namespace ui {
 class ComboboxModel;
@@ -22,10 +19,8 @@ using ui::ComboboxModel;
 
 namespace views {
 
-class NativeComboboxWrapper;
-
 // A non-editable combo-box (aka a drop-down list)
-class Combobox : public View {
+class VIEWS_API Combobox : public View {
  public:
   // The combobox's class name.
   static const char kViewClassName[];
@@ -66,14 +61,13 @@ class Combobox : public View {
   // Set the accessible name of the combo box.
   void SetAccessibleName(const string16& name);
 
-#ifdef UNIT_TEST
+  // Provided only for testing:
   gfx::NativeView GetTestingHandle() const {
     return native_wrapper_ ? native_wrapper_->GetTestingHandle() : NULL;
   }
-  NativeComboboxWrapper* native_wrapper() const {
+  NativeComboboxWrapper* GetNativeWrapperForTesting() const {
     return native_wrapper_;
   }
-#endif
 
   // Overridden from View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
diff --git a/views/controls/combobox/native_combobox_views_unittest.cc b/views/controls/combobox/native_combobox_views_unittest.cc
index 31aa194..4ebf021 100644
--- a/views/controls/combobox/native_combobox_views_unittest.cc
+++ b/views/controls/combobox/native_combobox_views_unittest.cc
@@ -109,8 +109,8 @@ class NativeComboboxViewsTest : public ViewsTestBase {
     widget_->SetContentsView(container);
     container->AddChildView(combobox_);
 
-    combobox_view_
-        = static_cast<NativeComboboxViews*>(combobox_->native_wrapper());
+    combobox_view_ = static_cast<NativeComboboxViews*>(
+        combobox_->GetNativeWrapperForTesting());
     ASSERT_TRUE(combobox_view_);
 
     input_method_ = new MockInputMethod();
diff --git a/views/controls/combobox/native_combobox_wrapper.h b/views/controls/combobox/native_combobox_wrapper.h
index 7d88563a..f84225a 100644
--- a/views/controls/combobox/native_combobox_wrapper.h
+++ b/views/controls/combobox/native_combobox_wrapper.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "ui/gfx/native_widget_types.h"
+#include "views/views_api.h"
 
 namespace gfx{
 class Size;
@@ -18,7 +19,7 @@ class Combobox;
 class KeyEvent;
 class View;
 
-class NativeComboboxWrapper {
+class VIEWS_API NativeComboboxWrapper {
  public:
   // Updates the combobox's content from its model.
   virtual void UpdateFromModel() = 0;
-- 
cgit v1.1