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

ui/views/controls/tabbed_pane/tabbed_pane.cc

 // Copyright (c) 2012 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.
 
 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 
 #include "base/logging.h"
 #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 (http://crbug.com/138059).
+#if defined(OS_WIN) && !defined(USE_AURA)
+#include "ui/views/controls/tabbed_pane/native_tabbed_pane_win.h"
+#endif
+
+namespace {
+
+views::NativeTabbedPaneWrapper* CreateNativeWrapper(
+    views::TabbedPane* tabbed_pane) {
+#if defined(OS_WIN) && !defined(USE_AURA)
+  if (tabbed_pane->use_native_win_control())
+    return new views::NativeTabbedPaneWin(tabbed_pane);
+#endif
+  return new views::NativeTabbedPaneViews(tabbed_pane);
+}
+
+}  // namespace
+
 namespace views {
 
 // static
 const char TabbedPane::kViewClassName[] = "views/TabbedPane";
 
-TabbedPane::TabbedPane() : native_tabbed_pane_(NULL), listener_(NULL) {
+TabbedPane::TabbedPane()
+  : native_tabbed_pane_(NULL),
+#if defined(OS_WIN) && !defined(USE_AURA)
+    use_native_win_control_(false),
+#endif
+    listener_(NULL) {
   set_focusable(true);
 }
 
 TabbedPane::~TabbedPane() {
 }
 
 int TabbedPane::GetTabCount() {
   return native_tabbed_pane_->GetTabCount();
 }
 
@@ skipping 48 matching lines @@
 
 void TabbedPane::Layout() {
   if (native_tabbed_pane_)
     native_tabbed_pane_->GetView()->SetBounds(0, 0, width(), height());
 }
 
 void TabbedPane::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
   if (is_add && !native_tabbed_pane_) {
     // The native wrapper's lifetime will be managed by the view hierarchy after
     // we call AddChildView.
-    native_tabbed_pane_ = NativeTabbedPaneWrapper::CreateNativeWrapper(this);
+    native_tabbed_pane_ = CreateNativeWrapper(this);
     AddChildView(native_tabbed_pane_->GetView());
     LoadAccelerators();
   }
 }
 
 bool TabbedPane::AcceleratorPressed(const ui::Accelerator& accelerator) {
   // We only accept Ctrl+Tab keyboard events.
   DCHECK(accelerator.key_code() == ui::VKEY_TAB && accelerator.IsCtrlDown());
 
   int tab_count = GetTabCount();
@@ skipping 34 matching lines @@
   if (NativeViewHost::kRenderNativeControlFocus)
     View::OnPaintFocusBorder(canvas);
 }
 
 void TabbedPane::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PAGETABLIST;
   state->name = accessible_name_;
 }
 
 }  // namespace views