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

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

Issue 2478863003: Fix the Web Bluetooth chooser when it is used on Chrome apps on non-Mac (Closed)
Patch Set: initialize pointer to be nullptr Created 4 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/chooser_content_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d277104b45cdfcd26f07dda91a006e27d40b2cf6..763207f60c1f15fbdc01c1c701ec70cd5fd2c77c 100644
--- a/chrome/browser/ui/views/chooser_content_view.h
+++ b/chrome/browser/ui/views/chooser_content_view.h
@@ -63,8 +63,7 @@ class ChooserContentView : public views::View,
base::string16 GetWindowTitle() const;
base::string16 GetDialogButtonLabel(ui::DialogButton button) const;
bool IsDialogButtonEnabled(ui::DialogButton button) const;
- // Ownership of the view is passed to the caller.
- views::StyledLabel* CreateFootnoteView();
+ views::StyledLabel* footnote_link() { return footnote_link_.get(); }
void Accept();
void Cancel();
void Close();
@@ -88,7 +87,7 @@ class ChooserContentView : public views::View,
views::View* table_parent_ = nullptr; // Weak.
views::StyledLabel* turn_adapter_off_help_ = nullptr; // Weak.
views::Throbber* throbber_ = nullptr; // Weak.
- views::StyledLabel* footnote_link_ = nullptr; // Weak.
+ std::unique_ptr<views::StyledLabel> footnote_link_;
base::string16 help_text_;
base::string16 help_and_scanning_text_;
base::string16 help_and_re_scan_text_;
« no previous file with comments | « no previous file | chrome/browser/ui/views/chooser_content_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698