Integrate Desktop iOS promotion with bookmarks.

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 <utility>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
@@ skipping 21 matching lines @@
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/md_text_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"
 
+#if defined(OS_WIN)
+#include "chrome/browser/sync/profile_sync_service_factory.h"
+#include "chrome/browser/ui/views/desktop_ios_promotion/desktop_ios_promotion_bubble_view.h"
+#include "components/browser_sync/profile_sync_service.h"
+#include "ui/views/layout/fill_layout.h"
+#endif
+
 using base::UserMetricsAction;
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 using views::ColumnSet;
 using views::GridLayout;
 
 namespace {
 
 // This combobox prevents any lengthy content from stretching the bubble view.
 class UnsizedCombobox : public views::Combobox {
@@ skipping 59 matching lines @@
 
 BookmarkBubbleView::~BookmarkBubbleView() {
   if (apply_edits_) {
     ApplyEdits();
   } else if (remove_bookmark_) {
     BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile_);
     const BookmarkNode* node = model->GetMostRecentlyAddedUserNodeForURL(url_);
     if (node)
       model->Remove(node);
   }
-  // |parent_combobox_| needs to be destroyed before |parent_model_| as it
-  // uses |parent_model_| in its destructor.
-  delete parent_combobox_;
+  if (!ios_promotion_viewed_) {
+    // |parent_combobox_| needs to be destroyed before |parent_model_| as it
+    // uses |parent_model_| in its destructor.
+    delete parent_combobox_;
+  }
 }
 
 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();
@@ skipping 81 matching lines @@
   layout->SkipColumns(2);
   layout->AddView(remove_button_);
   layout->AddView(edit_button_);
   layout->AddView(close_button_);
 
   AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE));
   AddAccelerator(ui::Accelerator(ui::VKEY_E, ui::EF_ALT_DOWN));
   AddAccelerator(ui::Accelerator(ui::VKEY_R, ui::EF_ALT_DOWN));
 }
 
+gfx::ImageSkia BookmarkBubbleView::GetWindowIcon() {
+#if defined(OS_WIN)
+  if (ios_promotion_viewed_) {
+    return desktop_ios_promotion::GetPromoImage(
+        GetNativeTheme()->GetSystemColor(
+            ui::NativeTheme::kColorId_TextfieldDefaultColor));
+  }
+#endif
+  return gfx::ImageSkia();
+}
+
+bool BookmarkBubbleView::ShouldShowWindowIcon() const {
+  return ios_promotion_viewed_;
+}
+
 base::string16 BookmarkBubbleView::GetWindowTitle() const {
+  if (ios_promotion_viewed_) {
+    return desktop_ios_promotion::GetPromoTitle(
+        desktop_ios_promotion::PromotionEntryPoint::BOOKMARKS_BUBBLE);
+  }
   return l10n_util::GetStringUTF16(newly_bookmarked_
                                        ? IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARKED
                                        : IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARK);
 }
 
 const char* BookmarkBubbleView::GetClassName() const {
   return "BookmarkBubbleView";
 }
 
 views::View* BookmarkBubbleView::GetInitiallyFocusedView() {
@@ skipping 26 matching lines @@
       newly_bookmarked_(newly_bookmarked),
       parent_model_(BookmarkModelFactory::GetForBrowserContext(profile_),
                     BookmarkModelFactory::GetForBrowserContext(profile_)
                         ->GetMostRecentlyAddedUserNodeForURL(url)),
       remove_button_(nullptr),
       edit_button_(nullptr),
       close_button_(nullptr),
       title_tf_(nullptr),
       parent_combobox_(nullptr),
       remove_bookmark_(false),
-      apply_edits_(true) {}
+      apply_edits_(true),
+      ios_promotion_viewed_(false) {}
 
 base::string16 BookmarkBubbleView::GetTitle() {
   BookmarkModel* bookmark_model =
       BookmarkModelFactory::GetForBrowserContext(profile_);
   const BookmarkNode* node =
       bookmark_model->GetMostRecentlyAddedUserNodeForURL(url_);
   if (node)
     return node->GetTitle();
   else
     NOTREACHED();
@@ skipping 24 matching lines @@
     content::RecordAction(UserMetricsAction("BookmarkBubble_Unstar"));
     // Set this so we remove the bookmark after the window closes.
     remove_bookmark_ = true;
     apply_edits_ = false;
     GetWidget()->Close();
   } else if (sender == edit_button_) {
     content::RecordAction(UserMetricsAction("BookmarkBubble_Edit"));
     ShowEditor();
   } else {
     DCHECK_EQ(close_button_, sender);
+#if defined(OS_WIN)
+    PrefService* prefs = profile_->GetPrefs();
+    const browser_sync::ProfileSyncService* sync_service =
+        ProfileSyncServiceFactory::GetForProfile(profile_);
+    if (desktop_ios_promotion::IsEligibleForIOSPromotion(
+            prefs, sync_service,
+            desktop_ios_promotion::PromotionEntryPoint::BOOKMARKS_BUBBLE)) {
+      apply_edits_ = false;

[sky, 2017/03/27 20:03:55]

Why are you resetting apply_edits_?

[mrefaat, 2017/03/29 19:50:18]

changed that

+      ShowIOSPromotion();
+    } else {
+      GetWidget()->Close();
+    }
+#else
     GetWidget()->Close();
+#endif
   }
 }
 
+void BookmarkBubbleView::ShowIOSPromotion() {

[sky, 2017/03/27 20:03:55]

Make order match header.

[mrefaat, 2017/03/29 19:50:18]

Done.

+  RemoveAllChildViews(true);

[sky, 2017/03/27 20:03:55]

Explicitly removing all the views is error prone (see the conditional you're
adding to the destructor). I would prefer you add the existing controls to a
View that is hidden and make the ios_promo_view_ visible as necessary.

[mrefaat, 2017/03/29 19:50:18]

Done.

+  SetLayoutManager(new views::FillLayout);
+  ios_promotion_viewed_ = true;
+  ios_promo_view_ = new DesktopIOSPromotionBubbleView(
+      profile_, desktop_ios_promotion::PromotionEntryPoint::BOOKMARKS_BUBBLE);
+  AddChildView(ios_promo_view_);
+  GetWidget()->non_client_view()->ResetWindowControls();
+  GetWidget()->UpdateWindowIcon();
+  GetWidget()->UpdateWindowTitle();
+  SizeToContents();
+}
+
 void BookmarkBubbleView::ShowEditor() {
   const BookmarkNode* node =
       BookmarkModelFactory::GetForBrowserContext(profile_)
           ->GetMostRecentlyAddedUserNodeForURL(url_);
   gfx::NativeWindow native_parent =
       anchor_widget() ? anchor_widget()->GetNativeWindow()
                       : platform_util::GetTopLevel(parent_window());
   DCHECK(native_parent);
 
   Profile* profile = profile_;
@@ skipping 15 matching lines @@
   if (node) {
     const base::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());
   }
 }