Use NativeTabbedPaneViews in the CollectedCookiesViews dialog.

chrome/browser/ui/views/collected_cookies_views.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 "chrome/browser/ui/views/collected_cookies_views.h"
 
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
@@ skipping 26 matching lines @@
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #include "ui/views/controls/tree/tree_view.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #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.
 void ShowCollectedCookiesDialog(content::WebContents* web_contents) {
   // Deletes itself on close.
   new CollectedCookiesViews(web_contents);
 }
 
 }  // namespace chrome
 
@@ skipping 227 matching lines @@
   using views::GridLayout;
 
   GridLayout* layout = GridLayout::CreatePanel(this);
   SetLayoutManager(layout);
 
   const int single_column_layout_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(single_column_layout_id);
   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(
       IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_TAB_LABEL);
   tabbed_pane->AddTab(label_allowed, CreateAllowedPane());
   tabbed_pane->AddTab(label_blocked, CreateBlockedPane());
   tabbed_pane->SelectTabAt(0);
   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_);
 
   EnableControls();
   ShowCookieInfo();
 }
 
 views::View* CollectedCookiesViews::CreateAllowedPane() {
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents_);
@@ skipping 179 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // CollectedCookiesViews, content::NotificationObserver implementation:
 
 void CollectedCookiesViews::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN, type);
   window_->CloseWebContentsModalDialog();
 }