Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(616)

Unified Diff: chrome/browser/ui/views/extensions/chooser_dialog_view.h

Issue 2086663003: Change ChooserController ownership model (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed temporary unique ptr at ChooserBubbleUiCocoa Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/extensions/chooser_dialog_view.h
diff --git a/chrome/browser/ui/views/extensions/chooser_dialog_view.h b/chrome/browser/ui/views/extensions/chooser_dialog_view.h
index e81c161387418a24f390becc083d6c21e78ae126..b33100a6d631d8aaa66e1ab7dd958173ee35cb20 100644
--- a/chrome/browser/ui/views/extensions/chooser_dialog_view.h
+++ b/chrome/browser/ui/views/extensions/chooser_dialog_view.h
@@ -5,10 +5,13 @@
#ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_CHOOSER_DIALOG_VIEW_H_
#define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_CHOOSER_DIALOG_VIEW_H_
+#include <memory>
+
#include "base/macros.h"
#include "ui/views/controls/styled_label_listener.h"
#include "ui/views/controls/table/table_view_observer.h"
#include "ui/views/window/dialog_delegate.h"
+#include "url/origin.h"
class ChooserContentView;
class ChooserController;
@@ -28,7 +31,7 @@ class ChooserDialogView : public views::DialogDelegateView,
public views::TableViewObserver {
public:
ChooserDialogView(content::WebContents* web_contents,
- ChooserController* chooser_controller);
+ std::unique_ptr<ChooserController> chooser_controller);
~ChooserDialogView() override;
// views::WidgetDelegate:
@@ -60,9 +63,9 @@ class ChooserDialogView : public views::DialogDelegateView,
views::TableView* table_view_for_test() const;
private:
- ChooserContentView* chooser_content_view_;
content::WebContents* web_contents_;
- ChooserController* chooser_controller_;
+ url::Origin origin_;
+ ChooserContentView* chooser_content_view_;
DISALLOW_COPY_AND_ASSIGN(ChooserDialogView);
};
« no previous file with comments | « chrome/browser/ui/views/chooser_content_view_unittest.cc ('k') | chrome/browser/ui/views/extensions/chooser_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698