| OLD | NEW |
| 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/browser_navigator.h" | 5 #include "chrome/browser/ui/browser_navigator.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 378 // WebContents. | 378 // WebContents. |
| 379 bool SwapInPrerender(const GURL& url, chrome::NavigateParams* params) { | 379 bool SwapInPrerender(const GURL& url, chrome::NavigateParams* params) { |
| 380 Profile* profile = | 380 Profile* profile = |
| 381 Profile::FromBrowserContext(params->target_contents->GetBrowserContext()); | 381 Profile::FromBrowserContext(params->target_contents->GetBrowserContext()); |
| 382 InstantSearchPrerenderer* prerenderer = | 382 InstantSearchPrerenderer* prerenderer = |
| 383 InstantSearchPrerenderer::GetForProfile(profile); | 383 InstantSearchPrerenderer::GetForProfile(profile); |
| 384 if (prerenderer && prerenderer->UsePrerenderedPage(url, params)) | 384 if (prerenderer && prerenderer->UsePrerenderedPage(url, params)) |
| 385 return true; | 385 return true; |
| 386 | 386 |
| 387 prerender::PrerenderManager* prerender_manager = | 387 prerender::PrerenderManager* prerender_manager = |
| 388 prerender::PrerenderManagerFactory::GetForProfile(profile); | 388 prerender::PrerenderManagerFactory::GetForBrowserContext(profile); |
| 389 return prerender_manager && | 389 return prerender_manager && |
| 390 prerender_manager->MaybeUsePrerenderedPage(url, params); | 390 prerender_manager->MaybeUsePrerenderedPage(url, params); |
| 391 } | 391 } |
| 392 | 392 |
| 393 } // namespace | 393 } // namespace |
| 394 | 394 |
| 395 | 395 |
| 396 namespace chrome { | 396 namespace chrome { |
| 397 | 397 |
| 398 void Navigate(NavigateParams* params) { | 398 void Navigate(NavigateParams* params) { |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 655 bool reverse_on_redirect = false; | 655 bool reverse_on_redirect = false; |
| 656 content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary( | 656 content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary( |
| 657 &rewritten_url, browser_context, &reverse_on_redirect); | 657 &rewritten_url, browser_context, &reverse_on_redirect); |
| 658 | 658 |
| 659 // Some URLs are mapped to uber subpages. Do not allow them in incognito. | 659 // Some URLs are mapped to uber subpages. Do not allow them in incognito. |
| 660 return !(rewritten_url.scheme() == content::kChromeUIScheme && | 660 return !(rewritten_url.scheme() == content::kChromeUIScheme && |
| 661 rewritten_url.host() == chrome::kChromeUIUberHost); | 661 rewritten_url.host() == chrome::kChromeUIUberHost); |
| 662 } | 662 } |
| 663 | 663 |
| 664 } // namespace chrome | 664 } // namespace chrome |
| OLD | NEW |