Bookmark sync promo for Views.

chrome/browser/ui/views/bookmarks/bookmark_bubble_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_bubble_view.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.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/profiles/profile.h"
 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view_observer.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 using content::UserMetricsAction;
 using views::ColumnSet;
 using views::GridLayout;
 
 namespace {
 
 // Minimum width of the the bubble.
 const int kMinBubbleWidth = 350;
 
+// Top padding of the bubble.
+const int kBubbleTopPadding = 12;
+
+// Width of the border of a button.
+const int kControlBorderWidth = 2;
+
 }  // namespace
 
 // Declared in browser_dialogs.h so callers don't have to depend on our header.
 
 namespace chrome {
 
 void ShowBookmarkBubbleView(views::View* anchor_view,
                             BookmarkBubbleViewObserver* observer,
                             Profile* profile,
                             const GURL& url,
-                            bool newly_bookmarked) {
-  BookmarkBubbleView::ShowBubble(anchor_view, observer, profile, url,
-                                 newly_bookmarked);
+                            bool newly_bookmarked,
+                            views::View* sync_promo_view) {
+  BookmarkBubbleView::ShowBubble(anchor_view,
+                                 observer,
+                                 profile,
+                                 url,
+                                 newly_bookmarked,
+                                 sync_promo_view);
 }
 
 void HideBookmarkBubbleView() {
   BookmarkBubbleView::Hide();
 }
 
 bool IsBookmarkBubbleViewShowing() {
   return BookmarkBubbleView::IsShowing();
 }
 
 }  // namespace chrome
 
 // BookmarkBubbleView ---------------------------------------------------------
 
 BookmarkBubbleView* BookmarkBubbleView::bookmark_bubble_ = NULL;
 
 // static
 void BookmarkBubbleView::ShowBubble(views::View* anchor_view,
                                     BookmarkBubbleViewObserver* observer,
                                     Profile* profile,
                                     const GURL& url,
-                                    bool newly_bookmarked) {
+                                    bool newly_bookmarked,
+                                    views::View* sync_promo_view) {
   if (IsShowing())
     return;
 
-  bookmark_bubble_ = new BookmarkBubbleView(anchor_view, observer, profile, url,
-                                            newly_bookmarked);
+  bookmark_bubble_ = new BookmarkBubbleView(anchor_view,
+                                            observer,
+                                            profile,
+                                            url,
+                                            newly_bookmarked,
+                                            sync_promo_view);
   views::BubbleDelegateView::CreateBubble(bookmark_bubble_)->Show();
   // Select the entire title textfield contents when the bubble is first shown.
   bookmark_bubble_->title_tf_->SelectAll(true);
   bookmark_bubble_->SetArrowPaintType(views::BubbleBorder::PAINT_NONE);
 
   if (bookmark_bubble_->observer_)
     bookmark_bubble_->observer_->OnBookmarkBubbleShown(url);
 }
 
 // static
@@ skipping 22 matching lines @@
 }
 
 void BookmarkBubbleView::WindowClosing() {
   // We have to reset |bubble_| here, not in our destructor, because we'll be
   // destroyed asynchronously and the shown state will be checked before then.
   DCHECK_EQ(bookmark_bubble_, this);
   bookmark_bubble_ = NULL;
 
   if (observer_)
     observer_->OnBookmarkBubbleHidden();
- }
+}
 
 bool BookmarkBubbleView::AcceleratorPressed(
     const ui::Accelerator& accelerator) {
   if (accelerator.key_code() == ui::VKEY_RETURN) {
      if (edit_button_->HasFocus())
        HandleButtonPressed(edit_button_);
      else
        HandleButtonPressed(close_button_);
      return true;
   } else if (accelerator.key_code() == ui::VKEY_ESCAPE) {
@@ skipping 28 matching lines @@
   views::Label* combobox_label = new views::Label(
       l10n_util::GetStringUTF16(IDS_BOOKMARK_BUBBLE_FOLDER_TEXT));
 
   parent_combobox_ = new views::Combobox(&parent_model_);
   parent_combobox_->set_listener(this);
   parent_combobox_->SetAccessibleName(combobox_label->text());
 
   GridLayout* layout = new GridLayout(this);
   SetLayoutManager(layout);
 
-  const int kTitleColumnSetID = 0;
-  ColumnSet* cs = layout->AddColumnSet(kTitleColumnSetID);
+  // Column sets used in the layout of the bubble.
+  enum ColumnSetID {
+    TITLE_COLUMN_SET_ID,
+    CONTENT_COLUMN_SET_ID,
+    SYNC_PROMO_COLUMN_SET_ID
+  };
+
+  ColumnSet* cs = layout->AddColumnSet(TITLE_COLUMN_SET_ID);
+  cs->AddPaddingColumn(0, views::kButtonHEdgeMarginNew);
   cs->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0, GridLayout::USE_PREF,
                 0, 0);
+  cs->AddPaddingColumn(0, views::kButtonHEdgeMarginNew);
 
   // The column layout used for middle and bottom rows.
-  const int kFirstColumnSetID = 1;
-  cs = layout->AddColumnSet(kFirstColumnSetID);
+  cs = layout->AddColumnSet(CONTENT_COLUMN_SET_ID);
+  cs->AddPaddingColumn(0, views::kButtonHEdgeMarginNew);
   cs->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                 GridLayout::USE_PREF, 0, 0);
   cs->AddPaddingColumn(0, views::kUnrelatedControlHorizontalSpacing);
 
   cs->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                 GridLayout::USE_PREF, 0, 0);
   cs->AddPaddingColumn(1, views::kUnrelatedControlLargeHorizontalSpacing);
 
   cs->AddColumn(GridLayout::LEADING, GridLayout::TRAILING, 0,
                 GridLayout::USE_PREF, 0, 0);
   cs->AddPaddingColumn(0, views::kRelatedButtonHSpacing);
   cs->AddColumn(GridLayout::LEADING, GridLayout::TRAILING, 0,
                 GridLayout::USE_PREF, 0, 0);
+  cs->AddPaddingColumn(0, views::kButtonHEdgeMarginNew);
 
-  layout->StartRow(0, kTitleColumnSetID);
+  layout->StartRow(0, TITLE_COLUMN_SET_ID);
   layout->AddView(title_label);
   layout->AddPaddingRow(0, views::kUnrelatedControlHorizontalSpacing);
 
-  layout->StartRow(0, kFirstColumnSetID);
+  layout->StartRow(0, CONTENT_COLUMN_SET_ID);
   views::Label* label = new views::Label(
       l10n_util::GetStringUTF16(IDS_BOOKMARK_BUBBLE_TITLE_TEXT));
   layout->AddView(label);
   title_tf_ = new views::Textfield();
   title_tf_->SetText(GetTitle());
   layout->AddView(title_tf_, 5, 1);
 
   layout->AddPaddingRow(0, views::kUnrelatedControlHorizontalSpacing);
 
-  layout->StartRow(0, kFirstColumnSetID);
+  layout->StartRow(0, CONTENT_COLUMN_SET_ID);
   layout->AddView(combobox_label);
   layout->AddView(parent_combobox_, 5, 1);
 
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
-  layout->StartRow(0, kFirstColumnSetID);
+  layout->StartRow(0, CONTENT_COLUMN_SET_ID);
   layout->SkipColumns(2);
   layout->AddView(remove_button_);
   layout->AddView(edit_button_);
   layout->AddView(close_button_);
 
+  layout->AddPaddingRow(
+      0,
+      views::kUnrelatedControlVerticalSpacing - kControlBorderWidth);
+
+  if (sync_promo_view_) {
+    // The column layout used for the sync promo.
+    cs = layout->AddColumnSet(SYNC_PROMO_COLUMN_SET_ID);
+    cs->AddColumn(GridLayout::FILL,
+                  GridLayout::FILL,
+                  1,
+                  GridLayout::USE_PREF,
+                  0,
+                  0);
+    layout->StartRow(0, SYNC_PROMO_COLUMN_SET_ID);
+    layout->AddView(sync_promo_view_);
+  }
+
   AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE));
 }
 
 BookmarkBubbleView::BookmarkBubbleView(views::View* anchor_view,
                                        BookmarkBubbleViewObserver* observer,
                                        Profile* profile,
                                        const GURL& url,
-                                       bool newly_bookmarked)
+                                       bool newly_bookmarked,
+                                       views::View* sync_promo_view)
     : BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT),
       observer_(observer),
       profile_(profile),
       url_(url),
       newly_bookmarked_(newly_bookmarked),
       parent_model_(
           BookmarkModelFactory::GetForProfile(profile_),
           BookmarkModelFactory::GetForProfile(profile_)->
               GetMostRecentlyAddedNodeForURL(url)),
       remove_button_(NULL),
       edit_button_(NULL),
       close_button_(NULL),
       title_tf_(NULL),
       parent_combobox_(NULL),
+      sync_promo_view_(sync_promo_view),
       remove_bookmark_(false),
       apply_edits_(true) {
   const SkColor background_color = GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_DialogBackground);
   set_color(background_color);
   set_background(views::Background::CreateSolidBackground(background_color));
-  set_margins(gfx::Insets(12, 19, 18, 18));
+  set_margins(gfx::Insets(kBubbleTopPadding, 0, 0, 0));
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_view_insets(gfx::Insets(7, 0, 7, 0));
 }
 
 string16 BookmarkBubbleView::GetTitle() {
   BookmarkModel* bookmark_model =
       BookmarkModelFactory::GetForProfile(profile_);
   const BookmarkNode* node =
       bookmark_model->GetMostRecentlyAddedNodeForURL(url_);
   if (node)
@@ skipping 62 matching lines @@
   if (node) {
     const string16 new_title = title_tf_->text();
     if (new_title != node->GetTitle()) {
       model->SetTitle(node, new_title);
       content::RecordAction(
           UserMetricsAction("BookmarkBubble_ChangeTitleInBubble"));
     }
     parent_model_.MaybeChangeParent(node, parent_combobox_->selected_index());
   }
 }