OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/blocked_content/blocked_window_params.h" | 5 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" |
6 | 6 |
7 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
8 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 8 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
9 #include "content/public/browser/render_view_host.h" | 9 #include "content/public/browser/render_view_host.h" |
10 #include "content/public/browser/web_contents.h" | 10 #include "content/public/browser/web_contents.h" |
11 #include "content/public/browser/web_contents_view.h" | 11 #include "content/public/browser/web_contents_view.h" |
12 #include "third_party/WebKit/public/web/WebWindowFeatures.h" | 12 #include "third_party/WebKit/public/web/WebWindowFeatures.h" |
13 #include "url/gurl.h" | 13 #include "url/gurl.h" |
14 | 14 |
15 BlockedWindowParams::BlockedWindowParams( | 15 BlockedWindowParams::BlockedWindowParams( |
16 const GURL& target_url, | 16 const GURL& target_url, |
17 const content::Referrer& referrer, | 17 const content::Referrer& referrer, |
18 WindowOpenDisposition disposition, | 18 WindowOpenDisposition disposition, |
19 const WebKit::WebWindowFeatures& features, | 19 const blink::WebWindowFeatures& features, |
20 bool user_gesture, | 20 bool user_gesture, |
21 bool opener_suppressed, | 21 bool opener_suppressed, |
22 int render_process_id, | 22 int render_process_id, |
23 int opener_id) | 23 int opener_id) |
24 : target_url_(target_url), | 24 : target_url_(target_url), |
25 referrer_(referrer), | 25 referrer_(referrer), |
26 disposition_(disposition), | 26 disposition_(disposition), |
27 features_(features), | 27 features_(features), |
28 user_gesture_(user_gesture), | 28 user_gesture_(user_gesture), |
29 opener_suppressed_(opener_suppressed), | 29 opener_suppressed_(opener_suppressed), |
(...skipping 28 matching lines...) Expand all Loading... |
58 nav_params.window_bounds.set_height(features_.height); | 58 nav_params.window_bounds.set_height(features_.height); |
59 | 59 |
60 // Compare RenderViewImpl::show(). | 60 // Compare RenderViewImpl::show(). |
61 if (!user_gesture_ && disposition_ != NEW_BACKGROUND_TAB) | 61 if (!user_gesture_ && disposition_ != NEW_BACKGROUND_TAB) |
62 nav_params.disposition = NEW_POPUP; | 62 nav_params.disposition = NEW_POPUP; |
63 else | 63 else |
64 nav_params.disposition = disposition_; | 64 nav_params.disposition = disposition_; |
65 | 65 |
66 return nav_params; | 66 return nav_params; |
67 } | 67 } |
OLD | NEW |