(Views only): Allow choosing between NativeTabbedPaneView and NativeTabbedPaneWin on Windows.

ui/views/controls/tabbed_pane/tabbed_pane.cc

Index: ui/views/controls/tabbed_pane/tabbed_pane.cc
diff --git a/ui/views/controls/tabbed_pane/tabbed_pane.cc b/ui/views/controls/tabbed_pane/tabbed_pane.cc
index b5dc08d965690596c543fe5a93e1d6f319309d87..beabd0c471f3a1969511c36733dde1c38f4bbdc6 100644
--- a/ui/views/controls/tabbed_pane/tabbed_pane.cc
+++ b/ui/views/controls/tabbed_pane/tabbed_pane.cc
@@ -8,10 +8,17 @@
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/views/controls/native/native_view_host.h"
+#include "ui/views/controls/tabbed_pane/native_tabbed_pane_views.h"
 #include "ui/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
 #include "ui/views/controls/tabbed_pane/tabbed_pane_listener.h"
 #include "ui/views/widget/widget.h"
 
+// TODO(markusheintz): This should be removed once the native windows tabbed
+// pane is not used anymore.

[msw, 2012/07/20 23:50:51]

ditto optional nit: include bug # and capitalize Windows.

[markusheintz_, 2012/07/23 12:22:06]

Done.

+#if defined(OS_WIN) && !defined(USE_AURA)
+#include "ui/views/controls/tabbed_pane/native_tabbed_pane_win.h"
+#endif
+
 namespace views {
 
 // static
@@ -19,6 +26,9 @@ const char TabbedPane::kViewClassName[] = "views/TabbedPane";
 
 TabbedPane::TabbedPane() : native_tabbed_pane_(NULL), listener_(NULL) {
   set_focusable(true);
+#if defined(OS_WIN) && !defined(USE_AURA)
+  set_use_native_win_control(false);

[msw, 2012/07/20 23:50:51]

Set this in the initializer list if it's not terribly difficult.

[markusheintz_, 2012/07/23 12:22:06]

Done. The coding style looks a bit strange but it works :).

+#endif
 }
 
 TabbedPane::~TabbedPane() {
@@ -140,4 +150,17 @@ void TabbedPane::GetAccessibleState(ui::AccessibleViewState* state) {
   state->name = accessible_name_;
 }
 
+///////////////////////////////////////////////////////////////////////////////
+// NativeTabbedPaneWrapper, public
+
+// static
+NativeTabbedPaneWrapper* NativeTabbedPaneWrapper::CreateNativeWrapper(

[msw, 2012/07/20 23:50:51]

Make this a static member on TabbedPane now and it'll be more at home in this
file. I should have probably done the same thing for
NativeTextfieldWrapper::CreateWrapper(), so I guess this is optional :)

[markusheintz_, 2012/07/23 12:22:06]

True. This static method feels a bit alien in this file. 

Here are some more thoughts of mine before I fix this:

Maybe I'm wrong here but I guess the method CreateNativeWrapper is only meant to
be used internally by |TabbedPane|. So I wonder weather it should be really
added to |TabbedPane| as static method. 

It feels more like having a tabbed_pane_wrapper.cc file that contains this
method. But then again, adding a .cc file just because of a single static method
seems like an overkill. 

We could also move this method to an anonymous namespace this file and delete it
from the TabbedPaneWrapperInterface. This way we don't expose this method to the
rest of the word. 


On 2012/07/20 23:50:51, msw wrote:

[msw, 2012/07/23 22:55:43]

This sgtm, since it's really an internal detail of the TabbedPane control, but
feel free to pursue another option if it makes more sense to you. TabbedPane /
NativeTabbedPaneWrapper / NativeTabPaneViews should probably all be merged into
one class once we deprecate NTPW.

+    TabbedPane* tabbed_pane) {
+#if defined(OS_WIN) && !defined(USE_AURA)
+  if (tabbed_pane->use_native_win_control())
+    return new NativeTabbedPaneWin(tabbed_pane);
+#endif
+  return new NativeTabbedPaneViews(tabbed_pane);
+}
+
 }  // namespace views