| OLD | NEW |
| 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 "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 | 159 |
| 160 return blocked_plugin; | 160 return blocked_plugin; |
| 161 } | 161 } |
| 162 | 162 |
| 163 void ChromePluginPlaceholder::SetStatus( | 163 void ChromePluginPlaceholder::SetStatus( |
| 164 ChromeViewHostMsg_GetPluginInfo_Status status) { | 164 ChromeViewHostMsg_GetPluginInfo_Status status) { |
| 165 status_ = status; | 165 status_ = status; |
| 166 } | 166 } |
| 167 | 167 |
| 168 #if defined(ENABLE_PLUGIN_INSTALLATION) | 168 #if defined(ENABLE_PLUGIN_INSTALLATION) |
| 169 int32 ChromePluginPlaceholder::CreateRoutingId() { | 169 int32_t ChromePluginPlaceholder::CreateRoutingId() { |
| 170 placeholder_routing_id_ = RenderThread::Get()->GenerateRoutingID(); | 170 placeholder_routing_id_ = RenderThread::Get()->GenerateRoutingID(); |
| 171 RenderThread::Get()->AddRoute(placeholder_routing_id_, this); | 171 RenderThread::Get()->AddRoute(placeholder_routing_id_, this); |
| 172 return placeholder_routing_id_; | 172 return placeholder_routing_id_; |
| 173 } | 173 } |
| 174 #endif | 174 #endif |
| 175 | 175 |
| 176 bool ChromePluginPlaceholder::OnMessageReceived(const IPC::Message& message) { | 176 bool ChromePluginPlaceholder::OnMessageReceived(const IPC::Message& message) { |
| 177 #if defined(ENABLE_PLUGIN_INSTALLATION) | 177 #if defined(ENABLE_PLUGIN_INSTALLATION) |
| 178 bool handled = true; | 178 bool handled = true; |
| 179 IPC_BEGIN_MESSAGE_MAP(ChromePluginPlaceholder, message) | 179 IPC_BEGIN_MESSAGE_MAP(ChromePluginPlaceholder, message) |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 | 380 |
| 381 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 381 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 382 switches::kEnablePluginPlaceholderTesting)) { | 382 switches::kEnablePluginPlaceholderTesting)) { |
| 383 builder.SetMethod<void (ChromePluginPlaceholder::*)()>( | 383 builder.SetMethod<void (ChromePluginPlaceholder::*)()>( |
| 384 "didFinishIconRepositionForTesting", | 384 "didFinishIconRepositionForTesting", |
| 385 &ChromePluginPlaceholder::DidFinishIconRepositionForTestingCallback); | 385 &ChromePluginPlaceholder::DidFinishIconRepositionForTestingCallback); |
| 386 } | 386 } |
| 387 | 387 |
| 388 return builder; | 388 return builder; |
| 389 } | 389 } |
| OLD | NEW |