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

Unified Diff: chrome/browser/ui/views/chooser_content_view.h

Issue 2086663003: Change ChooserController ownership model (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changed some Cocoa function names to start with lowercase letter 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/chooser_content_view.h
diff --git a/chrome/browser/ui/views/chooser_content_view.h b/chrome/browser/ui/views/chooser_content_view.h
index 75df792dc0222ecb8dbc10829a15e9e3e64d254a..57c5dd1cb1662d7a9b8654feefc8576940f2d4ae 100644
--- a/chrome/browser/ui/views/chooser_content_view.h
+++ b/chrome/browser/ui/views/chooser_content_view.h
@@ -31,7 +31,7 @@ class TableViewObserver;
class ChooserContentView : public views::View {
public:
ChooserContentView(views::TableViewObserver* observer,
- ChooserController* chooser_controller);
+ std::unique_ptr<ChooserController> chooser_controller);
~ChooserContentView() override;
// views::View:
@@ -45,17 +45,15 @@ class ChooserContentView : public views::View {
void Accept();
void Cancel();
void Close();
- void StyledLabelLinkClicked() const;
+ void StyledLabelLinkClicked();
void UpdateTableModel();
views::TableView* table_view_for_test() const { return table_view_; }
private:
- void ChooserControllerDestroying();
-
- ChooserController* chooser_controller_; // Weak.
- views::TableView* table_view_;
+ std::unique_ptr<ChooserController> chooser_controller_;
std::unique_ptr<ChooserTableModel> chooser_table_model_;
+ views::TableView* table_view_;
DISALLOW_COPY_AND_ASSIGN(ChooserContentView);
};

Powered by Google App Engine
This is Rietveld 408576698