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

Side by Side Diff: chrome/browser/ui/views/constrained_window_views.cc

Issue 554893002: [WORK_IN_PROGRESS] PDF::Save() fix for out-of-process-pdf. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: with print dialog fix (aura only) Created 6 years, 3 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 | « chrome/browser/resources/pdf/pdf.js ('k') | chrome/chrome_browser.gypi » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/constrained_window_views.h" 5 #include "chrome/browser/ui/views/constrained_window_views.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "chrome/browser/ui/browser_finder.h" 9 #include "chrome/browser/ui/browser_finder.h"
10 #include "components/web_modal/popup_manager.h" 10 #include "components/web_modal/popup_manager.h"
11 #include "components/web_modal/web_contents_modal_dialog_host.h" 11 #include "components/web_modal/web_contents_modal_dialog_host.h"
12 #include "extensions/browser/guest_view/web_view/web_view_guest.h" 12 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
13 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_gues t.h"
13 #include "ui/views/border.h" 14 #include "ui/views/border.h"
14 #include "ui/views/widget/widget.h" 15 #include "ui/views/widget/widget.h"
15 #include "ui/views/widget/widget_observer.h" 16 #include "ui/views/widget/widget_observer.h"
16 #include "ui/views/window/dialog_delegate.h" 17 #include "ui/views/window/dialog_delegate.h"
17 18
18 using web_modal::ModalDialogHost; 19 using web_modal::ModalDialogHost;
19 using web_modal::ModalDialogHostObserver; 20 using web_modal::ModalDialogHostObserver;
20 21
21 namespace { 22 namespace {
22 // The name of a key to store on the window handle to associate 23 // The name of a key to store on the window handle to associate
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 web_modal::ModalDialogHost* dialog_host) { 119 web_modal::ModalDialogHost* dialog_host) {
119 UpdateModalDialogPosition(widget, dialog_host, 120 UpdateModalDialogPosition(widget, dialog_host,
120 widget->GetRootView()->GetPreferredSize()); 121 widget->GetRootView()->GetPreferredSize());
121 } 122 }
122 123
123 views::Widget* ShowWebModalDialogViews( 124 views::Widget* ShowWebModalDialogViews(
124 views::WidgetDelegate* dialog, 125 views::WidgetDelegate* dialog,
125 content::WebContents* initiator_web_contents) { 126 content::WebContents* initiator_web_contents) {
126 extensions::WebViewGuest* web_view_guest = 127 extensions::WebViewGuest* web_view_guest =
127 extensions::WebViewGuest::FromWebContents(initiator_web_contents); 128 extensions::WebViewGuest::FromWebContents(initiator_web_contents);
129 printf("web_view_guest: [%p]\n", web_view_guest);
130
131 extensions::MimeHandlerViewGuest* mime_handler_view_guest =
132 extensions::MimeHandlerViewGuest::FromWebContents(initiator_web_contents);
133 printf("mime_handler_view_guest: [%p]\n", web_view_guest);
128 // For embedded WebContents, use the embedder's WebContents for constrained 134 // For embedded WebContents, use the embedder's WebContents for constrained
129 // window. 135 // window.
130 content::WebContents* web_contents = 136 content::WebContents* web_contents =
131 web_view_guest && web_view_guest->embedder_web_contents() ? 137 web_view_guest && web_view_guest->embedder_web_contents() ?
132 web_view_guest->embedder_web_contents() : initiator_web_contents; 138 web_view_guest->embedder_web_contents() :
139 (mime_handler_view_guest && mime_handler_view_guest->embedder_web_cont ents() ?
140 mime_handler_view_guest->embedder_web_contents() : initiator_web_ contents);
133 views::Widget* widget = CreateWebModalDialogViews(dialog, web_contents); 141 views::Widget* widget = CreateWebModalDialogViews(dialog, web_contents);
134 web_modal::PopupManager* popup_manager = 142 web_modal::PopupManager* popup_manager =
135 web_modal::PopupManager::FromWebContents(web_contents); 143 web_modal::PopupManager::FromWebContents(web_contents);
136 popup_manager->ShowModalDialog(widget->GetNativeWindow(), web_contents); 144 popup_manager->ShowModalDialog(widget->GetNativeWindow(), web_contents);
137 return widget; 145 return widget;
138 } 146 }
139 147
140 views::Widget* CreateWebModalDialogViews(views::WidgetDelegate* dialog, 148 views::Widget* CreateWebModalDialogViews(views::WidgetDelegate* dialog,
141 content::WebContents* web_contents) { 149 content::WebContents* web_contents) {
142 DCHECK_EQ(ui::MODAL_TYPE_CHILD, dialog->GetModalType()); 150 DCHECK_EQ(ui::MODAL_TYPE_CHILD, dialog->GetModalType());
(...skipping 17 matching lines...) Expand all
160 ChromeWebModalDialogManagerDelegate* manager = browser; 168 ChromeWebModalDialogManagerDelegate* manager = browser;
161 ModalDialogHost* host = manager->GetWebContentsModalDialogHost(); 169 ModalDialogHost* host = manager->GetWebContentsModalDialogHost();
162 DCHECK_EQ(parent, host->GetHostView()); 170 DCHECK_EQ(parent, host->GetHostView());
163 ModalDialogHostObserver* dialog_host_observer = 171 ModalDialogHostObserver* dialog_host_observer =
164 new BrowserModalDialogHostObserverViews( 172 new BrowserModalDialogHostObserverViews(
165 host, widget, kBrowserModalDialogHostObserverViewsKey); 173 host, widget, kBrowserModalDialogHostObserverViewsKey);
166 dialog_host_observer->OnPositionRequiresUpdate(); 174 dialog_host_observer->OnPositionRequiresUpdate();
167 } 175 }
168 return widget; 176 return widget;
169 } 177 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/pdf/pdf.js ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698