Index: components/chooser_controller/chooser_controller.h |
diff --git a/chrome/browser/ui/website_settings/chooser_bubble_controller.h b/components/chooser_controller/chooser_controller.h |
similarity index 67% |
copy from chrome/browser/ui/website_settings/chooser_bubble_controller.h |
copy to components/chooser_controller/chooser_controller.h |
index 3a75e86382140485463d37ee3a0369223abb231f..bf3e1e944e0c2388ce1e87b56a3785a564ee7c01 100644 |
--- a/chrome/browser/ui/website_settings/chooser_bubble_controller.h |
+++ b/components/chooser_controller/chooser_controller.h |
@@ -2,34 +2,33 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CHROME_BROWSER_UI_WEBSITE_SETTINGS_CHOOSER_BUBBLE_CONTROLLER_H_ |
-#define CHROME_BROWSER_UI_WEBSITE_SETTINGS_CHOOSER_BUBBLE_CONTROLLER_H_ |
+#ifndef COMPONENTS_CHOOSER_CONTROLLER_CHOOSER_CONTROLLER_H_ |
+#define COMPONENTS_CHOOSER_CONTROLLER_CHOOSER_CONTROLLER_H_ |
#include "base/macros.h" |
#include "base/strings/string16.h" |
-#include "components/bubble/bubble_delegate.h" |
-class Browser; |
class GURL; |
+namespace content { |
+class RenderFrameHost; |
+} |
+ |
namespace url { |
class Origin; |
} |
-// Subclass ChooserBubbleController to implement a chooser bubble, which has |
-// some introductory text and a list of options that users can pick one of. |
-// Create an instance of your subclass and pass it to |
-// BubbleManager::ShowBubble() to show the bubble. Your subclass must define |
-// the set of options users can pick from; the actions taken after users |
-// select an item or press the 'Cancel' button or the bubble is closed. |
-// You can also override GetName() to identify the bubble you define for |
-// collecting metrics. |
-// After Select/Cancel/Close is called, this object is destroyed and call back |
-// into it is not allowed. |
-class ChooserBubbleController : public BubbleDelegate { |
+// Subclass ChooserController to implement a chooser, which has some |
+// introductory text and a list of options that users can pick one of. |
+// Your subclass must define the set of options users can pick from; |
+// the actions taken after users select an item or press the 'Cancel' |
+// button or the chooser is closed. |
+// After Select/Cancel/Close is called, this object is destroyed and |
+// call back into it is not allowed. |
+class ChooserController { |
public: |
- explicit ChooserBubbleController(content::RenderFrameHost* owner); |
- ~ChooserBubbleController() override; |
+ explicit ChooserController(content::RenderFrameHost* owner); |
+ virtual ~ChooserController(); |
// Since the set of options can change while the UI is visible an |
// implementation should register an observer. |
@@ -58,14 +57,6 @@ class ChooserBubbleController : public BubbleDelegate { |
// Return the origin URL to be displayed on the bubble title. |
url::Origin GetOrigin() const; |
- // Open help center URL. |
- void OpenHelpCenterUrl() const; |
- |
- // BubbleDelegate: |
- std::string GetName() const override; |
- std::unique_ptr<BubbleUi> BuildBubbleUi() override; |
- const content::RenderFrameHost* OwningFrame() const override; |
- |
// The number of options users can pick from. For example, it can be |
// the number of USB/Bluetooth device names which are listed in the |
// chooser bubble so that users can grant permission. |
Reilly Grant (use Gerrit)
2016/05/17 17:19:00
chooser bubble -> chooser
juncai
2016/05/17 20:09:25
Done.
|
@@ -89,16 +80,20 @@ class ChooserBubbleController : public BubbleDelegate { |
// Get help center URL. |
virtual GURL GetHelpCenterUrl() const = 0; |
+ // Open help center URL. |
+ virtual void OpenHelpCenterUrl() const = 0; |
+ |
// Only one observer may be registered at a time. |
void set_observer(Observer* observer) { observer_ = observer; } |
Observer* observer() const { return observer_; } |
- private: |
- Browser* browser_; |
+ protected: |
const content::RenderFrameHost* const owning_frame_; |
+ |
+ private: |
Observer* observer_ = nullptr; |
- DISALLOW_COPY_AND_ASSIGN(ChooserBubbleController); |
+ DISALLOW_COPY_AND_ASSIGN(ChooserController); |
}; |
-#endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_CHOOSER_BUBBLE_CONTROLLER_H_ |
+#endif // COMPONENTS_CHOOSER_CONTROLLER_CHOOSER_CONTROLLER_H_ |