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

Side by Side Diff: content/browser/plugin_service_impl.cc

Issue 23064006: Test issue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Refactored PepperMessageFilter. Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « chrome/test/ppapi/ppapi_browsertest.cc ('k') | content/browser/ppapi_plugin_process_host.h » ('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 "content/browser/plugin_service_impl.h" 5 #include "content/browser/plugin_service_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 static bool counted = false; 349 static bool counted = false;
350 if (!counted && info->name == kFlashPluginName) { 350 if (!counted && info->name == kFlashPluginName) {
351 counted = true; 351 counted = true;
352 UMA_HISTOGRAM_ENUMERATION("Plugin.FlashUsage", 352 UMA_HISTOGRAM_ENUMERATION("Plugin.FlashUsage",
353 START_PPAPI_FLASH_AT_LEAST_ONCE, 353 START_PPAPI_FLASH_AT_LEAST_ONCE,
354 FLASH_USAGE_ENUM_COUNT); 354 FLASH_USAGE_ENUM_COUNT);
355 } 355 }
356 356
357 // This plugin isn't loaded by any plugin process, so create a new process. 357 // This plugin isn't loaded by any plugin process, so create a new process.
358 return PpapiPluginProcessHost::CreatePluginHost( 358 return PpapiPluginProcessHost::CreatePluginHost(
359 *info, profile_data_directory, 359 *info, profile_data_directory);
360 client->GetResourceContext()->GetHostResolver());
361 } 360 }
362 361
363 PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiBrokerProcess( 362 PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiBrokerProcess(
364 int render_process_id, 363 int render_process_id,
365 const base::FilePath& plugin_path) { 364 const base::FilePath& plugin_path) {
366 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 365 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
367 366
368 if (filter_ && !filter_->CanLoadPlugin(render_process_id, plugin_path)) 367 if (filter_ && !filter_->CanLoadPlugin(render_process_id, plugin_path))
369 return NULL; 368 return NULL;
370 369
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
837 window, kPluginVersionAtomProperty, plugin_version); 836 window, kPluginVersionAtomProperty, plugin_version);
838 return true; 837 return true;
839 } 838 }
840 839
841 bool PluginServiceImpl::IsPluginWindow(HWND window) { 840 bool PluginServiceImpl::IsPluginWindow(HWND window) {
842 return ui::GetClassName(window) == base::string16(kNativeWindowClassName); 841 return ui::GetClassName(window) == base::string16(kNativeWindowClassName);
843 } 842 }
844 #endif 843 #endif
845 844
846 } // namespace content 845 } // namespace content
OLDNEW
« no previous file with comments | « chrome/test/ppapi/ppapi_browsertest.cc ('k') | content/browser/ppapi_plugin_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698