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

Side by Side 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: added code to handle the footnote link pointer ownership 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_CHOOSER_CONTENT_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_CHOOSER_CONTENT_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_CHOOSER_CONTENT_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_CHOOSER_CONTENT_VIEW_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 FRIEND_TEST_ALL_PREFIXES(ChooserContentViewTest, 81 FRIEND_TEST_ALL_PREFIXES(ChooserContentViewTest,
82 DiscoveringAndOneOptionAddedAndSelectedAndIdle); 82 DiscoveringAndOneOptionAddedAndSelectedAndIdle);
83 FRIEND_TEST_ALL_PREFIXES(ChooserContentViewTest, ClickRescanLink); 83 FRIEND_TEST_ALL_PREFIXES(ChooserContentViewTest, ClickRescanLink);
84 FRIEND_TEST_ALL_PREFIXES(ChooserContentViewTest, ClickGetHelpLink); 84 FRIEND_TEST_ALL_PREFIXES(ChooserContentViewTest, ClickGetHelpLink);
85 85
86 std::unique_ptr<ChooserController> chooser_controller_; 86 std::unique_ptr<ChooserController> chooser_controller_;
87 views::TableView* table_view_ = nullptr; // Weak. 87 views::TableView* table_view_ = nullptr; // Weak.
88 views::View* table_parent_ = nullptr; // Weak. 88 views::View* table_parent_ = nullptr; // Weak.
89 views::StyledLabel* turn_adapter_off_help_ = nullptr; // Weak. 89 views::StyledLabel* turn_adapter_off_help_ = nullptr; // Weak.
90 views::Throbber* throbber_ = nullptr; // Weak. 90 views::Throbber* throbber_ = nullptr; // Weak.
91 // |footnote_link_ptr_| will transfer its ownership of the pointer to its
92 // caller when CreateFootnoteView() is called.
93 std::unique_ptr<views::StyledLabel> footnote_link_ptr_;
94 // |footnote_link_| holds a weak pointer of |footnote_link_ptr_|.
91 views::StyledLabel* footnote_link_ = nullptr; // Weak. 95 views::StyledLabel* footnote_link_ = nullptr; // Weak.
92 base::string16 help_text_; 96 base::string16 help_text_;
93 base::string16 help_and_scanning_text_; 97 base::string16 help_and_scanning_text_;
94 base::string16 help_and_re_scan_text_; 98 base::string16 help_and_re_scan_text_;
95 gfx::Range help_text_range_; 99 gfx::Range help_text_range_;
96 gfx::Range re_scan_text_range_; 100 gfx::Range re_scan_text_range_;
97 101
98 DISALLOW_COPY_AND_ASSIGN(ChooserContentView); 102 DISALLOW_COPY_AND_ASSIGN(ChooserContentView);
99 }; 103 };
100 104
101 #endif // CHROME_BROWSER_UI_VIEWS_CHOOSER_CONTENT_VIEW_H_ 105 #endif // CHROME_BROWSER_UI_VIEWS_CHOOSER_CONTENT_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/chooser_content_view.cc » ('j') | chrome/browser/ui/views/chooser_content_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698