Use NativeTabbedPaneViews in the CollectedCookiesViews dialog.

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 38a0896140d846a272665c8c028efb70d95d27f8..b2caba885623bd75a714487284c38f46a55112f4 100644
--- a/chrome/browser/ui/views/collected_cookies_views.cc
+++ b/chrome/browser/ui/views/collected_cookies_views.cc
@@ -44,12 +44,6 @@
 #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,22 +291,15 @@ void CollectedCookiesViews::Init() {
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
-  const int single_column_with_padding_layout_id = 1;
-  views::ColumnSet* column_set_with_padding = layout->AddColumnSet(
-      single_column_with_padding_layout_id);
-  column_set_with_padding->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
-                                     GridLayout::USE_PREF, 0, 0);
-  column_set_with_padding->AddPaddingColumn(0, 2);
-
   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
+  // This color matches native_tabbed_pane_views.cc's kTabBorderColor.
+  const SkColor border_color = SkColorSetRGB(0xCC, 0xCC, 0xCC);
+  // TODO(msw): Remove border and expand bounds in new dialog style.
+  tabbed_pane->set_border(views::Border::CreateSolidBorder(1, border_color));
+
   layout->AddView(tabbed_pane);
-  // NOTE: the panes need to be added after the tabbed_pane has been added to
-  // its parent.
+  // NOTE: Panes must be added after |tabbed_pane| has been added to its parent.
   string16 label_allowed = l10n_util::GetStringUTF16(
       IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_TAB_LABEL);
   string16 label_blocked = l10n_util::GetStringUTF16(
@@ -323,12 +310,12 @@ void CollectedCookiesViews::Init() {
   tabbed_pane->set_listener(this);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
-  layout->StartRow(0, single_column_with_padding_layout_id);
+  layout->StartRow(0, single_column_layout_id);
   cookie_info_view_ = new CookieInfoView(false);
   layout->AddView(cookie_info_view_);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
-  layout->StartRow(0, single_column_with_padding_layout_id);
+  layout->StartRow(0, single_column_layout_id);
   infobar_ = new InfobarView();
   layout->AddView(infobar_);