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

Side by Side Diff: chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc

Issue 2468403002: Make WebBluetooth chooser consistent on Android and desktops (desktop part) (Closed)
Patch Set: address comments 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.h" 5 #include "chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 views::BubbleBorder::Arrow anchor_arrow, 43 views::BubbleBorder::Arrow anchor_arrow,
44 std::unique_ptr<ChooserController> chooser_controller); 44 std::unique_ptr<ChooserController> chooser_controller);
45 ~ChooserBubbleUiViewDelegate() override; 45 ~ChooserBubbleUiViewDelegate() override;
46 46
47 // views::WidgetDelegate: 47 // views::WidgetDelegate:
48 base::string16 GetWindowTitle() const override; 48 base::string16 GetWindowTitle() const override;
49 49
50 // views::DialogDelegate: 50 // views::DialogDelegate:
51 base::string16 GetDialogButtonLabel(ui::DialogButton button) const override; 51 base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
52 bool IsDialogButtonEnabled(ui::DialogButton button) const override; 52 bool IsDialogButtonEnabled(ui::DialogButton button) const override;
53 views::View* CreateExtraView() override;
54 views::View* CreateFootnoteView() override; 53 views::View* CreateFootnoteView() override;
55 bool Accept() override; 54 bool Accept() override;
56 bool Cancel() override; 55 bool Cancel() override;
57 bool Close() override; 56 bool Close() override;
58 57
59 // views::DialogDelegateView: 58 // views::DialogDelegateView:
60 views::View* GetContentsView() override; 59 views::View* GetContentsView() override;
61 views::Widget* GetWidget() override; 60 views::Widget* GetWidget() override;
62 const views::Widget* GetWidget() const override; 61 const views::Widget* GetWidget() const override;
63 62
(...skipping 26 matching lines...) Expand all
90 // | -------------------------------- | 89 // | -------------------------------- |
91 // | | option 0 | | 90 // | | option 0 | |
92 // | | option 1 | | 91 // | | option 1 | |
93 // | | option 2 | | 92 // | | option 2 | |
94 // | | | | 93 // | | | |
95 // | | | | 94 // | | | |
96 // | | | | 95 // | | | |
97 // | -------------------------------- | 96 // | -------------------------------- |
98 // | [ Connect ] [ Cancel ] | 97 // | [ Connect ] [ Cancel ] |
99 // |----------------------------------| 98 // |----------------------------------|
100 // | Not seeing your device? Get help | 99 // | Get help |
101 // ------------------------------------ 100 // ------------------------------------
102 101
103 chooser_content_view_ = 102 chooser_content_view_ =
104 new ChooserContentView(this, std::move(chooser_controller)); 103 new ChooserContentView(this, std::move(chooser_controller));
105 } 104 }
106 105
107 ChooserBubbleUiViewDelegate::~ChooserBubbleUiViewDelegate() {} 106 ChooserBubbleUiViewDelegate::~ChooserBubbleUiViewDelegate() {}
108 107
109 base::string16 ChooserBubbleUiViewDelegate::GetWindowTitle() const { 108 base::string16 ChooserBubbleUiViewDelegate::GetWindowTitle() const {
110 return chooser_content_view_->GetWindowTitle(); 109 return chooser_content_view_->GetWindowTitle();
111 } 110 }
112 111
113 base::string16 ChooserBubbleUiViewDelegate::GetDialogButtonLabel( 112 base::string16 ChooserBubbleUiViewDelegate::GetDialogButtonLabel(
114 ui::DialogButton button) const { 113 ui::DialogButton button) const {
115 return chooser_content_view_->GetDialogButtonLabel(button); 114 return chooser_content_view_->GetDialogButtonLabel(button);
116 } 115 }
117 116
118 bool ChooserBubbleUiViewDelegate::IsDialogButtonEnabled( 117 bool ChooserBubbleUiViewDelegate::IsDialogButtonEnabled(
119 ui::DialogButton button) const { 118 ui::DialogButton button) const {
120 return chooser_content_view_->IsDialogButtonEnabled(button); 119 return chooser_content_view_->IsDialogButtonEnabled(button);
121 } 120 }
122 121
123 views::View* ChooserBubbleUiViewDelegate::CreateExtraView() {
124 return chooser_content_view_->CreateExtraView();
125 }
126
127 views::View* ChooserBubbleUiViewDelegate::CreateFootnoteView() { 122 views::View* ChooserBubbleUiViewDelegate::CreateFootnoteView() {
128 return chooser_content_view_->CreateFootnoteView(); 123 return chooser_content_view_->CreateFootnoteView();
129 } 124 }
130 125
131 bool ChooserBubbleUiViewDelegate::Accept() { 126 bool ChooserBubbleUiViewDelegate::Accept() {
132 chooser_content_view_->Accept(); 127 chooser_content_view_->Accept();
133 if (bubble_reference_) 128 if (bubble_reference_)
134 bubble_reference_->CloseBubble(BUBBLE_CLOSE_ACCEPTED); 129 bubble_reference_->CloseBubble(BUBBLE_CLOSE_ACCEPTED);
135 return true; 130 return true;
136 } 131 }
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 return browser_view->exclusive_access_bubble()->GetView(); 228 return browser_view->exclusive_access_bubble()->GetView();
234 229
235 return browser_view->top_container(); 230 return browser_view->top_container();
236 } 231 }
237 232
238 views::BubbleBorder::Arrow ChooserBubbleUiView::GetAnchorArrow() { 233 views::BubbleBorder::Arrow ChooserBubbleUiView::GetAnchorArrow() {
239 if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR)) 234 if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR))
240 return views::BubbleBorder::TOP_LEFT; 235 return views::BubbleBorder::TOP_LEFT;
241 return views::BubbleBorder::NONE; 236 return views::BubbleBorder::NONE;
242 } 237 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/extensions/chooser_dialog_view_unittest.cc ('k') | ui/views/controls/styled_label.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698