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

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

Issue 464533002: Move guest_view to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small changes are made in guest_view_manager_unittest.cc Created 6 years, 4 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
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/guest_view/web_view/web_view_guest.h" 9 #include "chrome/browser/guest_view/web_view/web_view_guest.h"
10 #include "chrome/browser/ui/browser_finder.h" 10 #include "chrome/browser/ui/browser_finder.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 116
117 void UpdateBrowserModalDialogPosition(views::Widget* widget, 117 void UpdateBrowserModalDialogPosition(views::Widget* widget,
118 web_modal::ModalDialogHost* dialog_host) { 118 web_modal::ModalDialogHost* dialog_host) {
119 UpdateModalDialogPosition(widget, dialog_host, 119 UpdateModalDialogPosition(widget, dialog_host,
120 widget->GetRootView()->GetPreferredSize()); 120 widget->GetRootView()->GetPreferredSize());
121 } 121 }
122 122
123 views::Widget* ShowWebModalDialogViews( 123 views::Widget* ShowWebModalDialogViews(
124 views::WidgetDelegate* dialog, 124 views::WidgetDelegate* dialog,
125 content::WebContents* initiator_web_contents) { 125 content::WebContents* initiator_web_contents) {
126 WebViewGuest* web_view_guest = WebViewGuest::FromWebContents( 126 extensions::WebViewGuest* web_view_guest =
127 initiator_web_contents); 127 extensions::WebViewGuest::FromWebContents(initiator_web_contents);
128 // For embedded WebContents, use the embedder's WebContents for constrained 128 // For embedded WebContents, use the embedder's WebContents for constrained
129 // window. 129 // window.
130 content::WebContents* web_contents = 130 content::WebContents* web_contents =
131 web_view_guest && web_view_guest->embedder_web_contents() ? 131 web_view_guest && web_view_guest->embedder_web_contents() ?
132 web_view_guest->embedder_web_contents() : initiator_web_contents; 132 web_view_guest->embedder_web_contents() : initiator_web_contents;
133 views::Widget* widget = CreateWebModalDialogViews(dialog, web_contents); 133 views::Widget* widget = CreateWebModalDialogViews(dialog, web_contents);
134 web_modal::PopupManager* popup_manager = 134 web_modal::PopupManager* popup_manager =
135 web_modal::PopupManager::FromWebContents(web_contents); 135 web_modal::PopupManager::FromWebContents(web_contents);
136 popup_manager->ShowModalDialog(widget->GetNativeWindow(), web_contents); 136 popup_manager->ShowModalDialog(widget->GetNativeWindow(), web_contents);
137 return widget; 137 return widget;
(...skipping 22 matching lines...) Expand all
160 ChromeWebModalDialogManagerDelegate* manager = browser; 160 ChromeWebModalDialogManagerDelegate* manager = browser;
161 ModalDialogHost* host = manager->GetWebContentsModalDialogHost(); 161 ModalDialogHost* host = manager->GetWebContentsModalDialogHost();
162 DCHECK_EQ(parent, host->GetHostView()); 162 DCHECK_EQ(parent, host->GetHostView());
163 ModalDialogHostObserver* dialog_host_observer = 163 ModalDialogHostObserver* dialog_host_observer =
164 new BrowserModalDialogHostObserverViews( 164 new BrowserModalDialogHostObserverViews(
165 host, widget, kBrowserModalDialogHostObserverViewsKey); 165 host, widget, kBrowserModalDialogHostObserverViewsKey);
166 dialog_host_observer->OnPositionRequiresUpdate(); 166 dialog_host_observer->OnPositionRequiresUpdate();
167 } 167 }
168 return widget; 168 return widget;
169 } 169 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698