diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/url_fixer_upper.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/web_contents.cc | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/url_fixer_upper.cc b/chrome/browser/url_fixer_upper.cc index 9fb2cde..920e70c 100644 --- a/chrome/browser/url_fixer_upper.cc +++ b/chrome/browser/url_fixer_upper.cc @@ -446,8 +446,7 @@ wstring URLFixerUpper::FixupRelativeFile(const wstring& base_dir, // escaped things. We need to go through 8-bit since the escaped values // only represent 8-bit values. std::wstring unescaped = UTF8ToWide(UnescapeURLComponent( - WideToUTF8(trimmed), - UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS)); + WideToUTF8(trimmed), UnescapeRule::SPACES | UnescapeRule::PERCENTS)); if (!ValidPathForFile(unescaped, &full_path)) is_file = false; } diff --git a/chrome/browser/web_contents.cc b/chrome/browser/web_contents.cc index 0111b9e..d86d5f4 100644 --- a/chrome/browser/web_contents.cc +++ b/chrome/browser/web_contents.cc @@ -860,7 +860,7 @@ SiteInstance* WebContents::GetSiteInstanceForEntry( if (entry.site_instance()) return entry.site_instance(); - // (UGLY) HEURISTIC, process-per-site only: + // (UGLY) HEURISTIC: // // If this navigation is generated, then it probably corresponds to a search // query. Given that search results typically lead to users navigating to @@ -870,8 +870,7 @@ SiteInstance* WebContents::GetSiteInstanceForEntry( // NOTE: This can be removed once we have a way to transition between // RenderViews in response to a link click. // - if (CommandLine().HasSwitch(switches::kProcessPerSite) && - entry.GetTransitionType() == PageTransition::GENERATED) + if (entry.GetTransitionType() == PageTransition::GENERATED) return curr_instance; const GURL& dest_url = entry.GetURL(); |