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

Side by Side Diff: chrome/renderer/plugins/chrome_plugin_placeholder.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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/plugins/chrome_plugin_placeholder.h" 5 #include "chrome/renderer/plugins/chrome_plugin_placeholder.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 21 matching lines...) Expand all
32 #include "third_party/WebKit/public/platform/URLConversion.h" 32 #include "third_party/WebKit/public/platform/URLConversion.h"
33 #include "third_party/WebKit/public/web/WebDocument.h" 33 #include "third_party/WebKit/public/web/WebDocument.h"
34 #include "third_party/WebKit/public/web/WebInputEvent.h" 34 #include "third_party/WebKit/public/web/WebInputEvent.h"
35 #include "third_party/WebKit/public/web/WebLocalFrame.h" 35 #include "third_party/WebKit/public/web/WebLocalFrame.h"
36 #include "third_party/WebKit/public/web/WebScriptSource.h" 36 #include "third_party/WebKit/public/web/WebScriptSource.h"
37 #include "third_party/WebKit/public/web/WebView.h" 37 #include "third_party/WebKit/public/web/WebView.h"
38 #include "ui/base/l10n/l10n_util.h" 38 #include "ui/base/l10n/l10n_util.h"
39 #include "ui/base/resource/resource_bundle.h" 39 #include "ui/base/resource/resource_bundle.h"
40 #include "ui/base/webui/jstemplate_builder.h" 40 #include "ui/base/webui/jstemplate_builder.h"
41 #include "ui/gfx/geometry/size.h" 41 #include "ui/gfx/geometry/size.h"
42 #include "url/origin.h"
42 #include "url/url_util.h" 43 #include "url/url_util.h"
43 44
44 using base::UserMetricsAction; 45 using base::UserMetricsAction;
45 using content::RenderThread; 46 using content::RenderThread;
46 using content::RenderView; 47 using content::RenderView;
47 48
48 namespace { 49 namespace {
49 const ChromePluginPlaceholder* g_last_active_menu = NULL; 50 const ChromePluginPlaceholder* g_last_active_menu = NULL;
50 } // namespace 51 } // namespace
51 52
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 424
424 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 425 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
425 switches::kEnablePluginPlaceholderTesting)) { 426 switches::kEnablePluginPlaceholderTesting)) {
426 builder.SetMethod<void (ChromePluginPlaceholder::*)()>( 427 builder.SetMethod<void (ChromePluginPlaceholder::*)()>(
427 "didFinishIconRepositionForTesting", 428 "didFinishIconRepositionForTesting",
428 &ChromePluginPlaceholder::DidFinishIconRepositionForTestingCallback); 429 &ChromePluginPlaceholder::DidFinishIconRepositionForTestingCallback);
429 } 430 }
430 431
431 return builder; 432 return builder;
432 } 433 }
OLDNEW
« no previous file with comments | « chrome/renderer/extensions/resource_request_policy.cc ('k') | chrome/renderer/worker_content_settings_client_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698