fix GridLayout::CreatePanel for new style dialogs

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 479 matching lines @@
         parent->RemoveChildView(purge_memory_button_);
       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();
-  int x = width() - size.width() - (new_style ? 0 : views::kPanelHorizMargin);
-  int y_buttons = new_style ? GetLocalBounds().bottom() - size.height() :
-      parent_bounds.bottom() - size.height() - views::kButtonVEdgeMargin;
+  const int horizontal_margin =
+      new_style ? views::kButtonHEdgeMarginNew : views::kPanelHorizMargin;
+  const int vertical_margin =
+      new_style ? views::kButtonVEdgeMarginNew : 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());
   }
 
   size = about_memory_link_->GetPreferredSize();
-  about_memory_link_->SetBounds(new_style ? 0 : views::kPanelHorizMargin,
+  about_memory_link_->SetBounds(
+      horizontal_margin,
       y_buttons + (kill_button_->height() - size.height()) / 2,
       size.width(), size.height());
 
   gfx::Rect rect = GetLocalBounds();
-  if (!new_style)
-    rect.Inset(views::kPanelHorizMargin, views::kPanelVertMargin);
+  rect.Inset(horizontal_margin, views::kPanelVertMargin);
   rect.Inset(0, 0, 0,
              kill_button_->height() + views::kUnrelatedControlVerticalSpacing);
   tab_table_parent_->SetBoundsRect(rect);
 }
 
 gfx::Size TaskManagerView::GetPreferredSize() {
   return gfx::Size(460, 270);
 }
 
 // static
@@ skipping 240 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