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 2692113002: harmony: fix sizing on webusb chooser dialog (Closed)
Patch Set: fix non-harmony size Created 3 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | ui/views/bubble/bubble_dialog_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
14 #include "chrome/browser/chooser_controller/chooser_controller.h" 14 #include "chrome/browser/chooser_controller/chooser_controller.h"
15 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/browser_window.h" 16 #include "chrome/browser/ui/browser_window.h"
17 #include "chrome/browser/ui/views/device_chooser_content_view.h" 17 #include "chrome/browser/ui/views/device_chooser_content_view.h"
18 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h" 18 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h"
19 #include "chrome/browser/ui/views/frame/browser_view.h" 19 #include "chrome/browser/ui/views/frame/browser_view.h"
20 #include "chrome/browser/ui/views/frame/top_container_view.h" 20 #include "chrome/browser/ui/views/frame/top_container_view.h"
21 #include "chrome/browser/ui/views/harmony/layout_delegate.h"
21 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 22 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
22 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" 23 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
23 #include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h" 24 #include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h"
24 #include "components/bubble/bubble_controller.h" 25 #include "components/bubble/bubble_controller.h"
25 #include "ui/views/controls/image_view.h" 26 #include "ui/views/controls/image_view.h"
26 #include "ui/views/controls/link.h" 27 #include "ui/views/controls/link.h"
27 #include "ui/views/controls/styled_label.h" 28 #include "ui/views/controls/styled_label.h"
28 #include "ui/views/controls/table/table_view_observer.h" 29 #include "ui/views/controls/table/table_view_observer.h"
29 #include "ui/views/window/dialog_client_view.h" 30 #include "ui/views/window/dialog_client_view.h"
30 31
(...skipping 16 matching lines...) Expand all
47 // views::WidgetDelegate: 48 // views::WidgetDelegate:
48 base::string16 GetWindowTitle() const override; 49 base::string16 GetWindowTitle() const override;
49 50
50 // views::DialogDelegate: 51 // views::DialogDelegate:
51 base::string16 GetDialogButtonLabel(ui::DialogButton button) const override; 52 base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
52 bool IsDialogButtonEnabled(ui::DialogButton button) const override; 53 bool IsDialogButtonEnabled(ui::DialogButton button) const override;
53 views::View* CreateFootnoteView() override; 54 views::View* CreateFootnoteView() override;
54 bool Accept() override; 55 bool Accept() override;
55 bool Cancel() override; 56 bool Cancel() override;
56 bool Close() override; 57 bool Close() override;
58 gfx::Size GetMinimumSize() const override;
57 59
58 // views::DialogDelegateView: 60 // views::DialogDelegateView:
59 views::View* GetContentsView() override; 61 views::View* GetContentsView() override;
60 views::Widget* GetWidget() override; 62 views::Widget* GetWidget() override;
61 const views::Widget* GetWidget() const override; 63 const views::Widget* GetWidget() const override;
62 64
63 // views::TableViewObserver: 65 // views::TableViewObserver:
64 void OnSelectionChanged() override; 66 void OnSelectionChanged() override;
65 67
66 // Updates the anchor's arrow and view. Also repositions the bubble so it's 68 // Updates the anchor's arrow and view. Also repositions the bubble so it's
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 if (bubble_reference_) 137 if (bubble_reference_)
136 bubble_reference_->CloseBubble(BUBBLE_CLOSE_CANCELED); 138 bubble_reference_->CloseBubble(BUBBLE_CLOSE_CANCELED);
137 return true; 139 return true;
138 } 140 }
139 141
140 bool ChooserBubbleUiViewDelegate::Close() { 142 bool ChooserBubbleUiViewDelegate::Close() {
141 device_chooser_content_view_->Close(); 143 device_chooser_content_view_->Close();
142 return true; 144 return true;
143 } 145 }
144 146
147 gfx::Size ChooserBubbleUiViewDelegate::GetMinimumSize() const {
148 const int kHeight = 320;
juncai 2017/02/14 18:30:13 nit: here uses const int, and at: https://cs.chrom
Elly Fong-Jones 2017/02/14 18:35:11 Done.
149 const int kDefaultWidth = 402;
juncai 2017/02/14 18:30:13 ditto.
Elly Fong-Jones 2017/02/14 18:35:11 Done.
150 int width = LayoutDelegate::Get()->GetDialogPreferredWidth(
151 LayoutDelegate::DialogWidth::MEDIUM);
152 if (!width)
153 width = kDefaultWidth;
154 return gfx::Size(width, kHeight);
155 }
156
145 views::View* ChooserBubbleUiViewDelegate::GetContentsView() { 157 views::View* ChooserBubbleUiViewDelegate::GetContentsView() {
146 return device_chooser_content_view_; 158 return device_chooser_content_view_;
147 } 159 }
148 160
149 views::Widget* ChooserBubbleUiViewDelegate::GetWidget() { 161 views::Widget* ChooserBubbleUiViewDelegate::GetWidget() {
150 return device_chooser_content_view_->GetWidget(); 162 return device_chooser_content_view_->GetWidget();
151 } 163 }
152 164
153 const views::Widget* ChooserBubbleUiViewDelegate::GetWidget() const { 165 const views::Widget* ChooserBubbleUiViewDelegate::GetWidget() const {
154 return device_chooser_content_view_->GetWidget(); 166 return device_chooser_content_view_->GetWidget();
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 return browser_view->exclusive_access_bubble()->GetView(); 240 return browser_view->exclusive_access_bubble()->GetView();
229 241
230 return browser_view->top_container(); 242 return browser_view->top_container();
231 } 243 }
232 244
233 views::BubbleBorder::Arrow ChooserBubbleUiView::GetAnchorArrow() { 245 views::BubbleBorder::Arrow ChooserBubbleUiView::GetAnchorArrow() {
234 if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR)) 246 if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR))
235 return views::BubbleBorder::TOP_LEFT; 247 return views::BubbleBorder::TOP_LEFT;
236 return views::BubbleBorder::NONE; 248 return views::BubbleBorder::NONE;
237 } 249 }
OLDNEW
« no previous file with comments | « no previous file | ui/views/bubble/bubble_dialog_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698