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

Side by Side Diff: chrome/browser/ui/views/extensions/chooser_dialog_view.cc

Issue 2874493002: Make ARC's intent picker use the buttons insets. (Closed)
Patch Set: Protecting against scenarios with no widget Created 3 years, 7 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 | chrome/browser/ui/views/intent_picker_bubble_view.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 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 #include "chrome/browser/ui/views/extensions/chooser_dialog_view.h" 5 #include "chrome/browser/ui/views/extensions/chooser_dialog_view.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "base/threading/thread_task_runner_handle.h" 8 #include "base/threading/thread_task_runner_handle.h"
9 #include "chrome/browser/chooser_controller/chooser_controller.h" 9 #include "chrome/browser/chooser_controller/chooser_controller.h"
10 #include "chrome/browser/extensions/api/chrome_device_permissions_prompt.h" 10 #include "chrome/browser/extensions/api/chrome_device_permissions_prompt.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 } 68 }
69 69
70 views::View* ChooserDialogView::CreateFootnoteView() { 70 views::View* ChooserDialogView::CreateFootnoteView() {
71 return device_chooser_content_view_->footnote_link(); 71 return device_chooser_content_view_->footnote_link();
72 } 72 }
73 73
74 views::ClientView* ChooserDialogView::CreateClientView(views::Widget* widget) { 74 views::ClientView* ChooserDialogView::CreateClientView(views::Widget* widget) {
75 views::DialogClientView* client = 75 views::DialogClientView* client =
76 new views::DialogClientView(widget, GetContentsView()); 76 new views::DialogClientView(widget, GetContentsView());
77 ChromeLayoutProvider* provider = ChromeLayoutProvider::Get(); 77 ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
78 client->set_button_row_insets(gfx::Insets( 78 client->SetButtonRowInsets(gfx::Insets(
79 provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_VERTICAL), 0, 0, 79 provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_VERTICAL), 0, 0,
80 0)); 80 0));
81 return client; 81 return client;
82 } 82 }
83 83
84 views::NonClientFrameView* ChooserDialogView::CreateNonClientFrameView( 84 views::NonClientFrameView* ChooserDialogView::CreateNonClientFrameView(
85 views::Widget* widget) { 85 views::Widget* widget) {
86 // ChooserDialogView always has a parent, so ShouldUseCustomFrame() should 86 // ChooserDialogView always has a parent, so ShouldUseCustomFrame() should
87 // always be true. 87 // always be true.
88 DCHECK(ShouldUseCustomFrame()); 88 DCHECK(ShouldUseCustomFrame());
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 void ChromeDevicePermissionsPrompt::ShowDialogViews() { 143 void ChromeDevicePermissionsPrompt::ShowDialogViews() {
144 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 144 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
145 145
146 std::unique_ptr<ChooserController> chooser_controller( 146 std::unique_ptr<ChooserController> chooser_controller(
147 new DevicePermissionsDialogController(web_contents()->GetMainFrame(), 147 new DevicePermissionsDialogController(web_contents()->GetMainFrame(),
148 prompt())); 148 prompt()));
149 149
150 constrained_window::ShowWebModalDialogViews( 150 constrained_window::ShowWebModalDialogViews(
151 new ChooserDialogView(std::move(chooser_controller)), web_contents()); 151 new ChooserDialogView(std::move(chooser_controller)), web_contents());
152 } 152 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/intent_picker_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698