Add dialog-specific styling, restore old-style task manager.

chrome/browser/ui/views/task_manager_view.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/task_manager/task_manager.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/metrics/stats_table.h"
 #include "base/prefs/pref_service.h"
@@ skipping 209 matching lines @@
                              const ui::Event& event) OVERRIDE;
 
   // views::DialogDelegateView:
   virtual bool CanResize() const OVERRIDE;
   virtual bool CanMaximize() const OVERRIDE;
   virtual bool ExecuteWindowsCommand(int command_id) OVERRIDE;
   virtual string16 GetWindowTitle() const OVERRIDE;
   virtual std::string GetWindowName() const OVERRIDE;
   virtual int GetDialogButtons() const OVERRIDE;
   virtual void WindowClosing() OVERRIDE;
+  virtual bool UseNewStyleForThisDialog() const OVERRIDE;
 
   // views::TableViewObserver:
   virtual void OnSelectionChanged() OVERRIDE;
   virtual void OnDoubleClick() OVERRIDE;
   virtual void OnKeyDown(ui::KeyboardCode keycode) OVERRIDE;
 
   // views::LinkListener:
   virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
 
   // Called by the column picker to pick up any new stat counters that
@@ skipping 246 matching lines @@
     } else {
       details.parent->RemoveChildView(kill_button_);
       if (purge_memory_button_)
         details.parent->RemoveChildView(purge_memory_button_);
       details.parent->RemoveChildView(about_memory_link_);
     }
   }
 }
 
 void TaskManagerView::Layout() {
-  bool new_style = views::DialogDelegate::UseNewStyle();
   gfx::Size size = kill_button_->GetPreferredSize();
   gfx::Rect parent_bounds = parent()->GetContentsBounds();
-  const int horizontal_margin =
-      new_style ? views::kButtonHEdgeMarginNew : views::kPanelHorizMargin;
-  const int vertical_margin =
-      new_style ? views::kButtonVEdgeMarginNew : views::kButtonVEdgeMargin;
+  const int horizontal_margin = views::kPanelHorizMargin;
+  const int vertical_margin = views::kButtonVEdgeMargin;
   int x = width() - size.width() - horizontal_margin;
   int y_buttons = parent_bounds.bottom() - size.height() - vertical_margin;
   kill_button_->SetBounds(x, y_buttons, size.width(), size.height());
 
   if (purge_memory_button_) {
     size = purge_memory_button_->GetPreferredSize();
     purge_memory_button_->SetBounds(
         kill_button_->x() - size.width() -
             views::kUnrelatedControlHorizontalSpacing,
         y_buttons, size.width(), size.height());
@@ skipping 131 matching lines @@
 
 void TaskManagerView::WindowClosing() {
   // Now that the window is closed, we can allow a new one to be opened.
   // (WindowClosing comes in asynchronously from the call to Close() and we
   // may have already opened a new instance).
   if (instance_ == this)
     instance_ = NULL;
   task_manager_->OnWindowClosed();
 }
 
+bool TaskManagerView::UseNewStyleForThisDialog() const {
+  return false;
+}
+
 // views::TableViewObserver implementation.
 void TaskManagerView::OnSelectionChanged() {
   const ui::ListSelectionModel::SelectedIndices& selection(
       tab_table_->selection_model().selected_indices());
   bool selection_contains_browser_process = false;
   for (size_t i = 0; i < selection.size(); ++i) {
     if (task_manager_->IsBrowserProcess(selection[i])) {
       selection_contains_browser_process = true;
       break;
     }
@@ skipping 109 matching lines @@
 }  // namespace
 
 namespace chrome {
 
 // Declared in browser_dialogs.h so others don't need to depend on our header.
 void ShowTaskManager(Browser* browser, bool highlight_background_resources) {
   TaskManagerView::Show(highlight_background_resources, browser);
 }
 
 }  // namespace chrome