Remove DialogDelegate::UseNewStyle and unused code.

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 9fceea8e0933810db05c7478f3c5ca829970e307..f113c1135c3d544d48436548ee924961e818b694 100644
--- a/chrome/browser/ui/views/collected_cookies_views.cc
+++ b/chrome/browser/ui/views/collected_cookies_views.cc
@@ -29,7 +29,6 @@
 #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"
@@ -213,11 +212,8 @@ CollectedCookiesViews::CollectedCookiesViews(content::WebContents* web_contents)
       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());
 }
 
@@ -331,13 +327,8 @@ void CollectedCookiesViews::Init() {
                         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.
@@ -354,9 +345,7 @@ void CollectedCookiesViews::Init() {
   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();
@@ -394,10 +383,8 @@ views::View* CollectedCookiesViews::CreateAllowedPane() {
 
   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;
@@ -407,9 +394,7 @@ views::View* CollectedCookiesViews::CreateAllowedPane() {
 
   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,
@@ -463,10 +448,8 @@ views::View* CollectedCookiesViews::CreateBlockedPane() {
 
   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;
@@ -484,9 +467,7 @@ views::View* CollectedCookiesViews::CreateBlockedPane() {
 
   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(
@@ -502,15 +483,11 @@ views::View* CollectedCookiesViews::CreateBlockedPane() {
 }
 
 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() {