| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/stringprintf.h" | 10 #include "base/stringprintf.h" |
| (...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 561 params->transition, | 561 params->transition, |
| 562 params->tabstrip_add_types); | 562 params->tabstrip_add_types); |
| 563 // Now that the |params->target_contents| is safely owned by the target | 563 // Now that the |params->target_contents| is safely owned by the target |
| 564 // Browser's TabStripModel, we can release ownership. | 564 // Browser's TabStripModel, we can release ownership. |
| 565 target_contents_owner.ReleaseOwnership(); | 565 target_contents_owner.ReleaseOwnership(); |
| 566 } | 566 } |
| 567 | 567 |
| 568 if (singleton_index >= 0) { | 568 if (singleton_index >= 0) { |
| 569 TabContents* target = params->browser->GetTabContentsAt(singleton_index); | 569 TabContents* target = params->browser->GetTabContentsAt(singleton_index); |
| 570 | 570 |
| 571 if (target->is_crashed()) { | 571 if (target->IsCrashed()) { |
| 572 target->GetController().Reload(true); | 572 target->GetController().Reload(true); |
| 573 } else if (params->path_behavior == NavigateParams::IGNORE_AND_NAVIGATE && | 573 } else if (params->path_behavior == NavigateParams::IGNORE_AND_NAVIGATE && |
| 574 target->GetURL() != params->url) { | 574 target->GetURL() != params->url) { |
| 575 InitializeExtraHeaders(params, NULL, &extra_headers); | 575 InitializeExtraHeaders(params, NULL, &extra_headers); |
| 576 LoadURLInContents(target, params->url, params, extra_headers); | 576 LoadURLInContents(target, params->url, params, extra_headers); |
| 577 } | 577 } |
| 578 | 578 |
| 579 // If the singleton tab isn't already selected, select it. | 579 // If the singleton tab isn't already selected, select it. |
| 580 if (params->source_contents != params->target_contents) | 580 if (params->source_contents != params->target_contents) |
| 581 params->browser->ActivateTabAt(singleton_index, user_initiated); | 581 params->browser->ActivateTabAt(singleton_index, user_initiated); |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 641 | 641 |
| 642 return !(url.scheme() == chrome::kChromeUIScheme && | 642 return !(url.scheme() == chrome::kChromeUIScheme && |
| 643 (url.host() == chrome::kChromeUISettingsHost || | 643 (url.host() == chrome::kChromeUISettingsHost || |
| 644 url.host() == chrome::kChromeUISettingsFrameHost || | 644 url.host() == chrome::kChromeUISettingsFrameHost || |
| 645 url.host() == chrome::kChromeUIExtensionsHost || | 645 url.host() == chrome::kChromeUIExtensionsHost || |
| 646 url.host() == chrome::kChromeUIBookmarksHost || | 646 url.host() == chrome::kChromeUIBookmarksHost || |
| 647 url.host() == chrome::kChromeUISyncPromoHost)); | 647 url.host() == chrome::kChromeUISyncPromoHost)); |
| 648 } | 648 } |
| 649 | 649 |
| 650 } // namespace browser | 650 } // namespace browser |
| OLD | NEW |