Remove DialogDelegate::UseNewStyle and unused code.

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 "base/prefs/pref_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 11 matching lines @@
 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/browser/ui/views/cookie_info_view.h"
 #include "chrome/common/pref_names.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/cookies/canonical_cookie.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/image_view.h"
@@ skipping 163 matching lines @@
       infobar_(NULL),
       status_changed_(false) {
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents);
   registrar_.Add(this, chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN,
                  content::Source<TabSpecificContentSettings>(content_settings));
   WebContentsModalDialogManager* web_contents_modal_dialog_manager =
       WebContentsModalDialogManager::FromWebContents(web_contents);
   WebContentsModalDialogManagerDelegate* modal_delegate =
       web_contents_modal_dialog_manager->delegate();
-  DCHECK(modal_delegate);

[sky, 2013/11/16 03:03:16]

And here.

[msw, 2013/11/16 04:15:44]

Done.

   window_ = views::Widget::CreateWindowAsFramelessChild(
-      this,
-      web_contents->GetView()->GetNativeView(),
-      modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
+      this, modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
   web_contents_modal_dialog_manager->ShowDialog(window_->GetNativeView());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CollectedCookiesViews, views::DialogDelegate implementation:
 
 string16 CollectedCookiesViews::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_DIALOG_TITLE);
 }
 
@@ skipping 93 matching lines @@
 
   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);
 
   layout->StartRow(0, single_column_layout_id);
-  views::TabbedPane* tabbed_pane = NULL;
-  if (DialogDelegate::UseNewStyle()) {
-    tabbed_pane = new views::TabbedPane(false);
-    layout->SetInsets(gfx::Insets(kTabbedPaneTopPadding, 0, 0, 0));
-  } else {
-    tabbed_pane = new views::TabbedPane(true);
-  }
+  views::TabbedPane* tabbed_pane = new views::TabbedPane();
+  layout->SetInsets(gfx::Insets(kTabbedPaneTopPadding, 0, 0, 0));
 
   layout->AddView(tabbed_pane);
   // 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_layout_id);
   cookie_info_view_ = new CookieInfoView();
   layout->AddView(cookie_info_view_);
-  layout->AddPaddingRow(0, DialogDelegate::UseNewStyle() ?
-                           kCookieInfoBottomPadding :
-                           views::kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, kCookieInfoBottomPadding);
 
   layout->StartRow(0, single_column_layout_id);
   infobar_ = new InfobarView();
   layout->AddView(infobar_);
 
   EnableControls();
   ShowCookieInfo();
 }
 
 views::View* CollectedCookiesViews::CreateAllowedPane() {
@@ skipping 17 matching lines @@
   block_allowed_button_ = new views::LabelButton(this,
       l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_BLOCK_BUTTON));
   block_allowed_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
 
   // Create the view that holds all the controls together.  This will be the
   // pane added to the tabbed pane.
   using views::GridLayout;
 
   views::View* pane = new views::View();
   GridLayout* layout = GridLayout::CreatePanel(pane);
-  if (DialogDelegate::UseNewStyle()) {
-    layout->SetInsets(kVPanelPadding, views::kButtonHEdgeMarginNew,
-                      kVPanelPadding, views::kButtonHEdgeMarginNew);
-  }
+  layout->SetInsets(kVPanelPadding, views::kButtonHEdgeMarginNew,
+                    kVPanelPadding, views::kButtonHEdgeMarginNew);
   pane->SetLayoutManager(layout);
 
   const int single_column_layout_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(single_column_layout_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, single_column_layout_id);
   layout->AddView(allowed_label_);
-  layout->AddPaddingRow(0, DialogDelegate::UseNewStyle() ?
-                           kLabelBottomPadding :
-                           views::kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, kLabelBottomPadding);
 
   layout->StartRow(1, single_column_layout_id);
   layout->AddView(CreateScrollView(allowed_cookies_tree_), 1, 1,
                   GridLayout::FILL, GridLayout::FILL, kTreeViewWidth,
                   kTreeViewHeight);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, single_column_layout_id);
   layout->AddView(block_allowed_button_, 1, 1, GridLayout::LEADING,
                   GridLayout::CENTER);
@@ skipping 33 matching lines @@
   for_session_blocked_button_ = new views::LabelButton(this,
       l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_SESSION_ONLY_BUTTON));
   for_session_blocked_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
 
   // Create the view that holds all the controls together.  This will be the
   // pane added to the tabbed pane.
   using views::GridLayout;
 
   views::View* pane = new views::View();
   GridLayout* layout = GridLayout::CreatePanel(pane);
-  if (DialogDelegate::UseNewStyle()) {
-    layout->SetInsets(kVPanelPadding, views::kButtonHEdgeMarginNew,
-                      kVPanelPadding, views::kButtonHEdgeMarginNew);
-  }
+  layout->SetInsets(kVPanelPadding, views::kButtonHEdgeMarginNew,
+                    kVPanelPadding, views::kButtonHEdgeMarginNew);
   pane->SetLayoutManager(layout);
 
   const int single_column_layout_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(single_column_layout_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   const int three_columns_layout_id = 1;
   column_set = layout->AddColumnSet(three_columns_layout_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, single_column_layout_id);
   layout->AddView(blocked_label_, 1, 1, GridLayout::FILL, GridLayout::FILL);
-  layout->AddPaddingRow(0, DialogDelegate::UseNewStyle() ?
-                           kLabelBottomPadding :
-                           views::kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, kLabelBottomPadding);
 
   layout->StartRow(1, single_column_layout_id);
   layout->AddView(
       CreateScrollView(blocked_cookies_tree_), 1, 1,
       GridLayout::FILL, GridLayout::FILL, kTreeViewWidth, kTreeViewHeight);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, three_columns_layout_id);
   layout->AddView(allow_blocked_button_);
   layout->AddView(for_session_blocked_button_);
 
   return pane;
 }
 
 views::View* CollectedCookiesViews::CreateScrollView(views::TreeView* pane) {
-  if (DialogDelegate::UseNewStyle()) {
-    views::ScrollView* scroll_view = new views::ScrollView();
-    scroll_view->SetContents(pane);
-    scroll_view->set_border(
-        views::Border::CreateSolidBorder(1, kCookiesBorderColor));
-    return scroll_view;
-  } else {
-    return pane->CreateParentIfNecessary();
-  }
+  views::ScrollView* scroll_view = new views::ScrollView();
+  scroll_view->SetContents(pane);
+  scroll_view->set_border(
+      views::Border::CreateSolidBorder(1, kCookiesBorderColor));
+  return scroll_view;
 }
 
 void CollectedCookiesViews::EnableControls() {
   bool enable_allowed_buttons = false;
   ui::TreeModelNode* node = allowed_cookies_tree_->GetSelectedNode();
   if (node) {
     CookieTreeNode* cookie_node = static_cast<CookieTreeNode*>(node);
     if (cookie_node->GetDetailedInfo().node_type ==
         CookieTreeNode::DetailedInfo::TYPE_HOST) {
       enable_allowed_buttons = static_cast<CookieTreeHostNode*>(
@@ skipping 52 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_->Close();
 }