Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 2382973002: Convert WebSecurityOrigin -> GURL without re-parsing the url (Closed)
Patch Set: rebase on #427122 Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/renderer/content_settings_observer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 #include "third_party/WebKit/public/web/WebDocument.h" 111 #include "third_party/WebKit/public/web/WebDocument.h"
112 #include "third_party/WebKit/public/web/WebElement.h" 112 #include "third_party/WebKit/public/web/WebElement.h"
113 #include "third_party/WebKit/public/web/WebLocalFrame.h" 113 #include "third_party/WebKit/public/web/WebLocalFrame.h"
114 #include "third_party/WebKit/public/web/WebPluginContainer.h" 114 #include "third_party/WebKit/public/web/WebPluginContainer.h"
115 #include "third_party/WebKit/public/web/WebPluginParams.h" 115 #include "third_party/WebKit/public/web/WebPluginParams.h"
116 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" 116 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
117 #include "ui/base/l10n/l10n_util.h" 117 #include "ui/base/l10n/l10n_util.h"
118 #include "ui/base/layout.h" 118 #include "ui/base/layout.h"
119 #include "ui/base/resource/resource_bundle.h" 119 #include "ui/base/resource/resource_bundle.h"
120 #include "ui/base/webui/jstemplate_builder.h" 120 #include "ui/base/webui/jstemplate_builder.h"
121 #include "url/origin.h"
121 122
122 #if !defined(DISABLE_NACL) 123 #if !defined(DISABLE_NACL)
123 #include "components/nacl/common/nacl_constants.h" 124 #include "components/nacl/common/nacl_constants.h"
124 #include "components/nacl/renderer/nacl_helper.h" 125 #include "components/nacl/renderer/nacl_helper.h"
125 #endif 126 #endif
126 127
127 #if defined(ENABLE_EXTENSIONS) 128 #if defined(ENABLE_EXTENSIONS)
128 #include "chrome/common/extensions/chrome_extensions_client.h" 129 #include "chrome/common/extensions/chrome_extensions_client.h"
129 #include "chrome/renderer/extensions/chrome_extensions_renderer_client.h" 130 #include "chrome/renderer/extensions/chrome_extensions_renderer_client.h"
130 #include "extensions/common/extension_urls.h" 131 #include "extensions/common/extension_urls.h"
(...skipping 1352 matching lines...) Expand 10 before | Expand all | Expand 10 after
1483 1484
1484 url::Replacements<char> r; 1485 url::Replacements<char> r;
1485 r.SetPath(path.c_str(), url::Component(0, path.length())); 1486 r.SetPath(path.c_str(), url::Component(0, path.length()));
1486 1487
1487 if (result == internal::NUM_PLUGIN_ERROR) 1488 if (result == internal::NUM_PLUGIN_ERROR)
1488 result = invalid_url ? internal::SUCCESS_PARAMS_REWRITE : internal::SUCCESS; 1489 result = invalid_url ? internal::SUCCESS_PARAMS_REWRITE : internal::SUCCESS;
1489 1490
1490 RecordYouTubeRewriteUMA(result); 1491 RecordYouTubeRewriteUMA(result);
1491 return corrected_url.ReplaceComponents(r); 1492 return corrected_url.ReplaceComponents(r);
1492 } 1493 }
OLDNEW
« no previous file with comments | « no previous file | chrome/renderer/content_settings_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698