OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #include <shellapi.h> | 9 #include <shellapi.h> |
10 #endif // defined(OS_WIN) | 10 #endif // defined(OS_WIN) |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
210 using content::NavigationEntry; | 210 using content::NavigationEntry; |
211 using content::OpenURLParams; | 211 using content::OpenURLParams; |
212 using content::PluginService; | 212 using content::PluginService; |
213 using content::Referrer; | 213 using content::Referrer; |
214 using content::SiteInstance; | 214 using content::SiteInstance; |
215 using content::UserMetricsAction; | 215 using content::UserMetricsAction; |
216 using content::WebContents; | 216 using content::WebContents; |
217 using extensions::Extension; | 217 using extensions::Extension; |
218 using ui::WebDialogDelegate; | 218 using ui::WebDialogDelegate; |
219 using web_modal::WebContentsModalDialogManager; | 219 using web_modal::WebContentsModalDialogManager; |
220 using WebKit::WebWindowFeatures; | 220 using blink::WebWindowFeatures; |
221 | 221 |
222 /////////////////////////////////////////////////////////////////////////////// | 222 /////////////////////////////////////////////////////////////////////////////// |
223 | 223 |
224 namespace { | 224 namespace { |
225 | 225 |
226 // How long we wait before updating the browser chrome while loading a page. | 226 // How long we wait before updating the browser chrome while loading a page. |
227 const int kUIUpdateCoalescingTimeMS = 200; | 227 const int kUIUpdateCoalescingTimeMS = 200; |
228 | 228 |
229 BrowserWindow* CreateBrowserWindow(Browser* browser) { | 229 BrowserWindow* CreateBrowserWindow(Browser* browser) { |
230 return BrowserWindow::CreateBrowserWindow(browser); | 230 return BrowserWindow::CreateBrowserWindow(browser); |
(...skipping 2040 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2271 if (contents && !allow_js_access) { | 2271 if (contents && !allow_js_access) { |
2272 contents->web_contents()->GetController().LoadURL( | 2272 contents->web_contents()->GetController().LoadURL( |
2273 target_url, | 2273 target_url, |
2274 content::Referrer(), | 2274 content::Referrer(), |
2275 content::PAGE_TRANSITION_LINK, | 2275 content::PAGE_TRANSITION_LINK, |
2276 std::string()); // No extra headers. | 2276 std::string()); // No extra headers. |
2277 } | 2277 } |
2278 | 2278 |
2279 return contents != NULL; | 2279 return contents != NULL; |
2280 } | 2280 } |
OLD | NEW |