Cleanup BookmarkBubbleView, remove LocationBarBubbleDelegateView::GetDialogButtons()

chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BUBBLE_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BUBBLE_VIEW_H_
 
 #include <memory>
 
-#include "base/compiler_specific.h"
-#include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
+#include "build/build_config.h"
 #include "chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h"
 #include "chrome/browser/ui/desktop_ios_promotion/desktop_ios_promotion_footnote_delegate.h"
 #include "chrome/browser/ui/sync/bubble_sync_promo_delegate.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "url/gurl.h"
 
 class Profile;
 
@@ skipping 36 matching lines @@
       Profile* profile,
       const GURL& url,
       bool already_bookmarked);
 
   static void Hide();
 
   static BookmarkBubbleView* bookmark_bubble() { return bookmark_bubble_; }
 
   ~BookmarkBubbleView() override;
 
-  // views::WidgetDelegate:
-  void WindowClosing() override;
-  bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
-  gfx::ImageSkia GetWindowIcon() override;
-  bool ShouldShowWindowIcon() const override;
-
- protected:
-  // views::BubbleDialogDelegateView method.
-  void Init() override;
-  base::string16 GetWindowTitle() const override;
-
  private:
   friend class BookmarkBubbleViewTest;
   friend class BookmarkBubbleViewBrowserTest;
-  FRIEND_TEST_ALL_PREFIXES(BookmarkBubbleViewTest, SyncPromoSignedIn);
-  FRIEND_TEST_ALL_PREFIXES(BookmarkBubbleViewTest, SyncPromoNotSignedIn);
-
-  // views::BubbleDialogDelegateView:
-  const char* GetClassName() const override;
-  View* GetInitiallyFocusedView() override;
-  View* CreateFootnoteView() override;
 
   // Creates a BookmarkBubbleView.
   BookmarkBubbleView(views::View* anchor_view,
                      bookmarks::BookmarkBubbleObserver* observer,
                      std::unique_ptr<BubbleSyncPromoDelegate> delegate,
                      Profile* profile,
                      const GURL& url,
                      bool newly_bookmarked);
 
-  // Returns the title to display.
-  base::string16 GetTitle();
+  // Returns the name of the bookmark.
+  base::string16 GetBookmarkName();
 
-  // Overridden from views::View:
-  void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
-
-  // Overridden from views::ButtonListener:
-  // Closes the bubble or opens the edit dialog.
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
-  // Overridden from views::ComboboxListener:
-  void OnPerformAction(views::Combobox* combobox) override;
-
-  // Handle the message when the user presses a button.
+  // Closes the bubble, opens the edit dialog, or shows the iOS promo.
   void HandleButtonPressed(views::Button* sender);
 
   // Shows the BookmarkEditor.
   void ShowEditor();
 
-  // Sets the title and parent of the node.
+  // Sets the bookmark name and parent of the node.
   void ApplyEdits();
 
-  // DesktopIOSPromotionFootnoteDelegate :
-  void OnIOSPromotionFootnoteLinkClicked() override;
-
 #if defined(OS_WIN)
-  // Check eligiblity to showthe iOS promotion from a specific entry point.
+  // Check eligibility to show the iOS promotion from a specific entry point.
   bool IsIOSPromotionEligible(
       desktop_ios_promotion::PromotionEntryPoint entry_point);
 
   // Shows the iOS promotion.
   void ShowIOSPromotion(desktop_ios_promotion::PromotionEntryPoint entry_point);
 #endif
 
+  // views::LocationBarBubbleDelegateView:
+  int GetDialogButtons() const override;
+  View* GetInitiallyFocusedView() override;
+  base::string16 GetWindowTitle() const override;
+  gfx::ImageSkia GetWindowIcon() override;
+  bool ShouldShowWindowIcon() const override;
+  void WindowClosing() override;
+  View* CreateFootnoteView() override;
+  const char* GetClassName() const override;
+  bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
+  void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
+  void Init() override;
+
+  // views::ButtonListener:
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
+
+  // views::ComboboxListener:
+  void OnPerformAction(views::Combobox* combobox) override;
+
+  // DesktopIOSPromotionFootnoteDelegate:
+  void OnIOSPromotionFootnoteLinkClicked() override;
+
   // The bookmark bubble, if we're showing one.
   static BookmarkBubbleView* bookmark_bubble_;
 
   // Our observer, to notify when the bubble shows or hides.
   bookmarks::BookmarkBubbleObserver* observer_;
 
   // Delegate, to handle clicks on the sign in link.
   std::unique_ptr<BubbleSyncPromoDelegate> delegate_;
 
   // The profile.
   Profile* profile_;
 
   // The bookmark URL.
   const GURL url_;
 
   // If true, the page was just bookmarked.
   const bool newly_bookmarked_;
 
   RecentlyUsedFoldersComboModel parent_model_;
 
   // Button for removing the bookmark.
   views::LabelButton* remove_button_;
 
   // Button to bring up the editor.
   views::LabelButton* edit_button_;
 
-  // Button to close the window.
-  views::LabelButton* close_button_;
+  // Button to save the bookmark.
+  views::LabelButton* save_button_;
 
-  // Textfield showing the title of the bookmark.
-  views::Textfield* title_tf_;
+  // Textfield showing the name of the bookmark.
+  views::Textfield* name_field_;
 
   // Combobox showing a handful of folders the user can choose from, including
   // the current parent.
   views::Combobox* parent_combobox_;
 
-  // Bookmark details view, contains the details of the bookmark with controls
-  // to edit it.
-  std::unique_ptr<View> bookmark_details_view_;
+  // The regular bookmark bubble contents, with all the edit fields and dialog
+  // buttons. TODO(tapted): Move the buttons to the DialogClientView.
+  views::View* bookmark_contents_view_;
 
   // iOS promotion view.
   DesktopIOSPromotionBubbleView* ios_promo_view_;
 
   // Footnote view.
   views::View* footnote_view_;
 
   // When the destructor is invoked should the bookmark be removed?
   bool remove_bookmark_;
 
   // When the destructor is invoked should edits be applied?
   bool apply_edits_;
 
   // Whether the Windows to iOS promotion is shown to the user.
   bool is_showing_ios_promotion_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkBubbleView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BUBBLE_VIEW_H_