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

chrome/browser/ui/views/collected_cookies_views.cc

Index: chrome/browser/ui/views/collected_cookies_views.cc
diff --git a/chrome/browser/ui/views/collected_cookies_views.cc b/chrome/browser/ui/views/collected_cookies_views.cc
index 7f9e2eea4475c8af73ae9a8e56695f1a847a51fe..efc3fd1e678e54430ab1daea6ea7b072e80014f1 100644
--- a/chrome/browser/ui/views/collected_cookies_views.cc
+++ b/chrome/browser/ui/views/collected_cookies_views.cc
@@ -45,6 +45,12 @@
 #include "ui/views/layout/layout_constants.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 chrome {
 
 // Declared in browser_dialogs.h so others don't have to depend on our header.
@@ -297,6 +303,10 @@ void CollectedCookiesViews::Init() {
 
   layout->StartRow(0, single_column_layout_id);
   views::TabbedPane* tabbed_pane = new views::TabbedPane();
+#if defined(OS_WIN) && !defined(USE_AURA)
+  // "set_use_native_win_control" must be called before the first tab is added.
+  tabbed_pane->set_use_native_win_control(true);
+#endif
   layout->AddView(tabbed_pane);
   // NOTE: the panes need to be added after the tabbed_pane has been added to
   // its parent.