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

Side by Side Diff: chrome/renderer/plugins/chrome_plugin_placeholder.cc

Issue 2387613002: Merge Content Settings IPCs back to chrome/common/render_messages.h (Closed)
Patch Set: Cover param_traits in chrome/common/OWNERS, as requested by the presubmit script Created 4 years, 2 months 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"
11 #include "base/feature_list.h" 11 #include "base/feature_list.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/common/chrome_features.h" 15 #include "chrome/common/chrome_features.h"
16 #include "chrome/common/prerender_messages.h" 16 #include "chrome/common/prerender_messages.h"
17 #include "chrome/common/render_messages.h" 17 #include "chrome/common/render_messages.h"
18 #include "chrome/grit/generated_resources.h" 18 #include "chrome/grit/generated_resources.h"
19 #include "chrome/grit/renderer_resources.h" 19 #include "chrome/grit/renderer_resources.h"
20 #include "chrome/renderer/chrome_content_renderer_client.h" 20 #include "chrome/renderer/chrome_content_renderer_client.h"
21 #include "chrome/renderer/content_settings_observer.h" 21 #include "chrome/renderer/content_settings_observer.h"
22 #include "chrome/renderer/custom_menu_commands.h" 22 #include "chrome/renderer/custom_menu_commands.h"
23 #include "chrome/renderer/plugins/plugin_preroller.h" 23 #include "chrome/renderer/plugins/plugin_preroller.h"
24 #include "chrome/renderer/plugins/plugin_uma.h" 24 #include "chrome/renderer/plugins/plugin_uma.h"
25 #include "components/content_settings/content/common/content_settings_messages.h "
26 #include "components/strings/grit/components_strings.h" 25 #include "components/strings/grit/components_strings.h"
27 #include "content/public/common/content_switches.h" 26 #include "content/public/common/content_switches.h"
28 #include "content/public/common/context_menu_params.h" 27 #include "content/public/common/context_menu_params.h"
29 #include "content/public/renderer/render_frame.h" 28 #include "content/public/renderer/render_frame.h"
30 #include "content/public/renderer/render_thread.h" 29 #include "content/public/renderer/render_thread.h"
31 #include "gin/object_template_builder.h" 30 #include "gin/object_template_builder.h"
32 #include "third_party/WebKit/public/platform/URLConversion.h" 31 #include "third_party/WebKit/public/platform/URLConversion.h"
33 #include "third_party/WebKit/public/web/WebDocument.h" 32 #include "third_party/WebKit/public/web/WebDocument.h"
34 #include "third_party/WebKit/public/web/WebInputEvent.h" 33 #include "third_party/WebKit/public/web/WebInputEvent.h"
35 #include "third_party/WebKit/public/web/WebLocalFrame.h" 34 #include "third_party/WebKit/public/web/WebLocalFrame.h"
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 427
429 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 428 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
430 switches::kEnablePluginPlaceholderTesting)) { 429 switches::kEnablePluginPlaceholderTesting)) {
431 builder.SetMethod<void (ChromePluginPlaceholder::*)()>( 430 builder.SetMethod<void (ChromePluginPlaceholder::*)()>(
432 "didFinishIconRepositionForTesting", 431 "didFinishIconRepositionForTesting",
433 &ChromePluginPlaceholder::DidFinishIconRepositionForTestingCallback); 432 &ChromePluginPlaceholder::DidFinishIconRepositionForTestingCallback);
434 } 433 }
435 434
436 return builder; 435 return builder;
437 } 436 }
OLDNEW
« no previous file with comments | « chrome/renderer/content_settings_observer_browsertest.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