Implement new Task Manager and Edit Bookmark style, etc.

chrome/browser/ui/views/bookmarks/bookmark_editor_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/ui/views/bookmarks/bookmark_editor_view.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/prefs/public/pref_service_base.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/events/event.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/background.h"
+#include "ui/views/controls/button/chrome_style.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/tree/tree_view.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 
 using views::GridLayout;
 
 namespace {
 
 // Background color of text field when URL is invalid.
 const SkColor kErrorColor = SkColorSetRGB(0xFF, 0xBC, 0xBC);
 
-// Preferred width of the tree.
-const int kTreeWidth = 300;
-
 }  // namespace
 
 // static
 void BookmarkEditor::Show(gfx::NativeWindow parent_window,
                           Profile* profile,
                           const EditDetails& details,
                           Configuration configuration) {
   DCHECK(profile);
   BookmarkEditorView* editor = new BookmarkEditorView(profile,
       details.parent_node, details, configuration);
@@ skipping 70 matching lines @@
   // Otherwise save changes and close the dialog box.
   ApplyEdits();
   return true;
 }
 
 bool BookmarkEditorView::AreAcceleratorsEnabled(ui::DialogButton button) {
   return !show_tree_ || !tree_view_->GetEditingNode();
 }
 
 void BookmarkEditorView::Layout() {
-  // Let the grid layout manager lay out most of the dialog...
   GetLayoutManager()->Layout(this);
 
   if (!show_tree_)
     return;
 
-  // Manually lay out the New Folder button in the same row as the OK/Cancel
-  // buttons...
+  // Manually align the New Folder button with the Save and Cancel buttons.
+  gfx::Size size = new_folder_button_->GetPreferredSize();
   gfx::Rect parent_bounds = parent()->GetContentsBounds();
-  gfx::Size prefsize = new_folder_button_->GetPreferredSize();
-  int button_y =
-      parent_bounds.bottom() - prefsize.height() - views::kButtonVEdgeMargin;
-  new_folder_button_->SetBounds(
-      views::kPanelHorizMargin, button_y, prefsize.width(), prefsize.height());
+  int x = views::DialogDelegate::UseNewStyle() ? 0 : views::kPanelHorizMargin;
+  int y = views::DialogDelegate::UseNewStyle() ? GetLocalBounds().bottom() :
+      parent_bounds.bottom() - size.height() - views::kButtonVEdgeMargin;
+  new_folder_button_->SetBounds(x, y, size.width(), size.height());
 }
 
 gfx::Size BookmarkEditorView::GetPreferredSize() {
   if (!show_tree_)
     return views::View::GetPreferredSize();
 
   return gfx::Size(views::Widget::GetLocalizedContentsSize(
       IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS,
       IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES));
 }
@@ skipping 79 matching lines @@
       }
       deletes_.push_back(node->value);
     }
     tree_model_->Remove(node->parent(), node);
   } else {
     DCHECK_EQ(IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM, command_id);
     NewFolder();
   }
 }
 
-void BookmarkEditorView::Show(gfx::NativeWindow parent_window) {
-  views::Widget::CreateWindowWithParent(this, parent_window);
+void BookmarkEditorView::Show(gfx::NativeWindow parent) {
+  views::DialogDelegateView::CreateDialogWidget(this, NULL, parent);
   UserInputChanged();
   if (show_tree_ && bb_model_->IsLoaded())
     ExpandAndSelect();
   GetWidget()->Show();
   // Select all the text in the name Textfield.
   title_tf_->SelectAll(true);
   // Give focus to the name Textfield.
   title_tf_->RequestFocus();
 }
 
@@ skipping 46 matching lines @@
   title_tf_->SetAccessibleName(title_label_->text());
 
   if (show_tree_) {
     tree_view_ = new views::TreeView;
     tree_view_->SetRootShown(false);
     tree_view_->set_lines_at_root(true);
     tree_view_->set_context_menu_controller(this);
 
     new_folder_button_.reset(new views::NativeTextButton(this,
         l10n_util::GetStringUTF16(IDS_BOOKMARK_EDITOR_NEW_FOLDER_BUTTON)));
+    if (DialogDelegate::UseNewStyle())
+      views::ApplyChromeStyle(new_folder_button_.get());
     new_folder_button_->set_owned_by_client();
     new_folder_button_->SetEnabled(false);
   }
 
-  // Yummy layout code.
   GridLayout* layout = GridLayout::CreatePanel(this);
+  if (views::DialogDelegate::UseNewStyle())
+    layout->SetInsets(gfx::Insets());
   SetLayoutManager(layout);
 
   const int labels_column_set_id = 0;
   const int single_column_view_set_id = 1;
   const int buttons_column_set_id = 2;
 
   views::ColumnSet* column_set = layout->AddColumnSet(labels_column_set_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   column_set = layout->AddColumnSet(single_column_view_set_id);
-  column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
-                        GridLayout::FIXED, kTreeWidth, 0);
+  if (views::DialogDelegate::UseNewStyle()) {
+    column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
+                          GridLayout::USE_PREF, 0, 0);
+  } else {
+    column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
+                          GridLayout::FIXED, 300, 0);
+  }
 
   column_set = layout->AddColumnSet(buttons_column_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::LEADING, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(1, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::LEADING, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::LEADING, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->LinkColumnSizes(0, 2, 4, -1);
 
   layout->StartRow(0, labels_column_set_id);
-
   layout->AddView(title_label_);
   layout->AddView(title_tf_);
 
   if (details_.GetNodeType() != BookmarkNode::FOLDER) {
     url_label_ = new views::Label(
-      l10n_util::GetStringUTF16(IDS_BOOKMARK_EDITOR_URL_LABEL));
+        l10n_util::GetStringUTF16(IDS_BOOKMARK_EDITOR_URL_LABEL));
 
     url_tf_ = new views::Textfield;
     PrefServiceBase* prefs = profile_ ?
         PrefServiceBase::FromBrowserContext(profile_) :
         NULL;
     url_tf_->SetText(chrome::FormatBookmarkURLForDisplay(url, prefs));
     url_tf_->SetController(this);
     url_tf_->SetAccessibleName(url_label_->text());
 
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
@@ skipping 273 matching lines @@
         IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM);
   }
   return context_menu_model_.get();
 }
 
 void BookmarkEditorView::EditorTreeModel::SetTitle(ui::TreeModelNode* node,
                                                    const string16& title) {
   if (!title.empty())
     ui::TreeNodeModel<EditorNode>::SetTitle(node, title);
 }