Reorder methods in BookmarkBubbleView.

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/metrics/user_metrics.h"
@@ skipping 112 matching lines @@
     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_;
 }
 
+// views::WidgetDelegate -------------------------------------------------------
+
+views::View* BookmarkBubbleView::GetInitiallyFocusedView() {
+  return title_tf_;
+}
+
+base::string16 BookmarkBubbleView::GetWindowTitle() const {
+#if defined(OS_WIN)
+  if (is_showing_ios_promotion_) {
+    return desktop_ios_promotion::GetPromoTitle(
+        desktop_ios_promotion::PromotionEntryPoint::BOOKMARKS_BUBBLE);
+  }
+#endif
+  return l10n_util::GetStringUTF16(newly_bookmarked_
+                                       ? IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARKED
+                                       : IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARK);
+}
+
+gfx::ImageSkia BookmarkBubbleView::GetWindowIcon() {
+#if defined(OS_WIN)
+  if (is_showing_ios_promotion_) {
+    return desktop_ios_promotion::GetPromoImage(
+        GetNativeTheme()->GetSystemColor(
+            ui::NativeTheme::kColorId_TextfieldDefaultColor));
+  }
+#endif
+  return gfx::ImageSkia();
+}
+
+bool BookmarkBubbleView::ShouldShowWindowIcon() const {
+  return is_showing_ios_promotion_;
+}
+
 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;
   is_showing_ios_promotion_ = false;
 
   if (observer_)
     observer_->OnBookmarkBubbleHidden();
 }
 
+// views::DialogDelegate -------------------------------------------------------
+
+views::View* BookmarkBubbleView::CreateFootnoteView() {
+#if defined(OS_WIN)
+  if (!is_showing_ios_promotion_ &&
+      IsIOSPromotionEligible(
+          desktop_ios_promotion::PromotionEntryPoint::BOOKMARKS_FOOTNOTE)) {
+    footnote_view_ = new DesktopIOSPromotionFootnoteView(profile_, this);
+    return footnote_view_;
+  }
+#endif
+  if (!SyncPromoUI::ShouldShowSyncPromo(profile_))
+    return nullptr;
+
+  base::RecordAction(UserMetricsAction("Signin_Impression_FromBookmarkBubble"));
+
+  footnote_view_ =
+      new BubbleSyncPromoView(delegate_.get(), IDS_BOOKMARK_SYNC_PROMO_LINK,
+                              IDS_BOOKMARK_SYNC_PROMO_MESSAGE);
+  return footnote_view_;
+}
+
+// views::View -----------------------------------------------------------------
+
+const char* BookmarkBubbleView::GetClassName() const {
+  return "BookmarkBubbleView";
+}
+
 bool BookmarkBubbleView::AcceleratorPressed(
     const ui::Accelerator& accelerator) {
   ui::KeyboardCode key_code = accelerator.key_code();
   if (key_code == ui::VKEY_RETURN) {
     HandleButtonPressed(close_button_);
     return true;
   }
   if (key_code == ui::VKEY_E && accelerator.IsAltDown()) {
     HandleButtonPressed(edit_button_);
     return true;
   }
   if (key_code == ui::VKEY_R && accelerator.IsAltDown()) {
     HandleButtonPressed(remove_button_);
     return true;
   }
 
   return LocationBarBubbleDelegateView::AcceleratorPressed(accelerator);
 }
 
+void BookmarkBubbleView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
+  LocationBarBubbleDelegateView::GetAccessibleNodeData(node_data);
+  node_data->SetName(l10n_util::GetStringUTF8(
+      newly_bookmarked_ ? IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARKED
+                        : IDS_BOOKMARK_AX_BUBBLE_PAGE_BOOKMARK));
+}
+
+// views::ButtonListener -------------------------------------------------------
+
+void BookmarkBubbleView::ButtonPressed(views::Button* sender,
+                                       const ui::Event& event) {
+  HandleButtonPressed(sender);
+}
+
+// views::ComboboxListener -----------------------------------------------------
+
+void BookmarkBubbleView::OnPerformAction(views::Combobox* combobox) {
+  if (combobox->selected_index() + 1 == parent_model_.GetItemCount()) {
+    base::RecordAction(UserMetricsAction("BookmarkBubble_EditFromCombobox"));
+    ShowEditor();
+  }
+}
+
+// DesktopIOSPromotionFootnoteDelegate -----------------------------------------
+
+void BookmarkBubbleView::OnIOSPromotionFootnoteLinkClicked() {
+#if defined(OS_WIN)
+  ShowIOSPromotion(
+      desktop_ios_promotion::PromotionEntryPoint::FOOTNOTE_FOLLOWUP_BUBBLE);
+#endif
+}
+
+// views::BubbleDialogDelegateView ---------------------------------------------
+
 void BookmarkBubbleView::Init() {
   remove_button_ = views::MdTextButton::CreateSecondaryUiButton(
       this, l10n_util::GetStringUTF16(IDS_BOOKMARK_BUBBLE_REMOVE_BOOKMARK));
 
   edit_button_ = views::MdTextButton::CreateSecondaryUiButton(
       this, l10n_util::GetStringUTF16(IDS_BOOKMARK_BUBBLE_OPTIONS));
 
   close_button_ = views::MdTextButton::CreateSecondaryUiButton(
       this, l10n_util::GetStringUTF16(IDS_DONE));
   close_button_->SetIsDefault(true);
@@ skipping 61 matching lines @@
   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));
 
   AddChildView(bookmark_details_view_.get());
 }
 
-gfx::ImageSkia BookmarkBubbleView::GetWindowIcon() {
-#if defined(OS_WIN)
-  if (is_showing_ios_promotion_) {
-    return desktop_ios_promotion::GetPromoImage(
-        GetNativeTheme()->GetSystemColor(
-            ui::NativeTheme::kColorId_TextfieldDefaultColor));
-  }
-#endif
-  return gfx::ImageSkia();
-}
-
-bool BookmarkBubbleView::ShouldShowWindowIcon() const {
-  return is_showing_ios_promotion_;
-}
-
-base::string16 BookmarkBubbleView::GetWindowTitle() const {
-#if defined(OS_WIN)
-  if (is_showing_ios_promotion_) {
-    return desktop_ios_promotion::GetPromoTitle(
-        desktop_ios_promotion::PromotionEntryPoint::BOOKMARKS_BUBBLE);
-  }
-#endif
-  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() {
-  return title_tf_;
-}
-
-views::View* BookmarkBubbleView::CreateFootnoteView() {
-#if defined(OS_WIN)
-  if (!is_showing_ios_promotion_ &&
-      IsIOSPromotionEligible(
-          desktop_ios_promotion::PromotionEntryPoint::BOOKMARKS_FOOTNOTE)) {
-    footnote_view_ = new DesktopIOSPromotionFootnoteView(profile_, this);
-    return footnote_view_;
-  }
-#endif
-  if (!SyncPromoUI::ShouldShowSyncPromo(profile_))
-    return nullptr;
-
-  base::RecordAction(
-      base::UserMetricsAction("Signin_Impression_FromBookmarkBubble"));
-
-  footnote_view_ =
-      new BubbleSyncPromoView(delegate_.get(), IDS_BOOKMARK_SYNC_PROMO_LINK,
-                              IDS_BOOKMARK_SYNC_PROMO_MESSAGE);
-  return footnote_view_;
-}
+// Private methods -------------------------------------------------------------
 
 BookmarkBubbleView::BookmarkBubbleView(
     views::View* anchor_view,
     bookmarks::BookmarkBubbleObserver* observer,
     std::unique_ptr<BubbleSyncPromoDelegate> delegate,
     Profile* profile,
     const GURL& url,
     bool newly_bookmarked)
     : LocationBarBubbleDelegateView(anchor_view, nullptr),
       observer_(observer),
@@ skipping 22 matching lines @@
       BookmarkModelFactory::GetForBrowserContext(profile_);
   const BookmarkNode* node =
       bookmark_model->GetMostRecentlyAddedUserNodeForURL(url_);
   if (node)
     return node->GetTitle();
   else
     NOTREACHED();
   return base::string16();
 }
 
-void BookmarkBubbleView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
-  LocationBarBubbleDelegateView::GetAccessibleNodeData(node_data);
-  node_data->SetName(l10n_util::GetStringUTF8(
-      newly_bookmarked_ ? IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARKED
-                        : IDS_BOOKMARK_AX_BUBBLE_PAGE_BOOKMARK));
-}
-
-void BookmarkBubbleView::ButtonPressed(views::Button* sender,
-                                       const ui::Event& event) {
-  HandleButtonPressed(sender);
-}
-
-void BookmarkBubbleView::OnPerformAction(views::Combobox* combobox) {
-  if (combobox->selected_index() + 1 == parent_model_.GetItemCount()) {
-    base::RecordAction(UserMetricsAction("BookmarkBubble_EditFromCombobox"));
-    ShowEditor();
-  }
-}
-
 void BookmarkBubbleView::HandleButtonPressed(views::Button* sender) {
   if (sender == remove_button_) {
     base::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_) {
     base::RecordAction(UserMetricsAction("BookmarkBubble_Edit"));
     ShowEditor();
@@ skipping 42 matching lines @@
     const base::string16 new_title = title_tf_->text();
     if (new_title != node->GetTitle()) {
       model->SetTitle(node, new_title);
       base::RecordAction(
           UserMetricsAction("BookmarkBubble_ChangeTitleInBubble"));
     }
     parent_model_.MaybeChangeParent(node, parent_combobox_->selected_index());
   }
 }
 
-void BookmarkBubbleView::OnIOSPromotionFootnoteLinkClicked() {
-#if defined(OS_WIN)
-  ShowIOSPromotion(
-      desktop_ios_promotion::PromotionEntryPoint::FOOTNOTE_FOLLOWUP_BUBBLE);
-#endif
-}
-
 #if defined(OS_WIN)
 
 bool BookmarkBubbleView::IsIOSPromotionEligible(
     desktop_ios_promotion::PromotionEntryPoint entry_point) {
   PrefService* prefs = profile_->GetPrefs();
   const browser_sync::ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
   return desktop_ios_promotion::IsEligibleForIOSPromotion(prefs, sync_service,
                                                           entry_point);
 }
 
 void BookmarkBubbleView::ShowIOSPromotion(
     desktop_ios_promotion::PromotionEntryPoint entry_point) {
   DCHECK(!is_showing_ios_promotion_);
   RemoveChildView(bookmark_details_view_.get());
   delete footnote_view_;
   footnote_view_ = nullptr;
   is_showing_ios_promotion_ = true;
   ios_promo_view_ = new DesktopIOSPromotionBubbleView(profile_, entry_point);
   AddChildView(ios_promo_view_);
   GetWidget()->UpdateWindowIcon();
   GetWidget()->UpdateWindowTitle();
   // Resize the bubble so it has the same width as the parent bubble.
   ios_promo_view_->UpdateBubbleHeight();
 }
 #endif