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

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

Issue 206713004: Report PPAPI plugin load error code to UMA. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use std::string directly. Created 6 years, 9 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
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_render_process_observer.h" 5 #include "chrome/renderer/chrome_render_process_observer.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/allocator/allocator_extension.h" 10 #include "base/allocator/allocator_extension.h"
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 287
288 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS) 288 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS)
289 // On platforms where we use system NSS shared libraries, 289 // On platforms where we use system NSS shared libraries,
290 // initialize NSS now because it won't be able to load the .so's 290 // initialize NSS now because it won't be able to load the .so's
291 // after we engage the sandbox. 291 // after we engage the sandbox.
292 if (!command_line.HasSwitch(switches::kSingleProcess)) 292 if (!command_line.HasSwitch(switches::kSingleProcess))
293 crypto::InitNSSSafely(); 293 crypto::InitNSSSafely();
294 #elif defined(OS_WIN) 294 #elif defined(OS_WIN)
295 // crypt32.dll is used to decode X509 certificates for Chromoting. 295 // crypt32.dll is used to decode X509 certificates for Chromoting.
296 // Only load this library when the feature is enabled. 296 // Only load this library when the feature is enabled.
297 std::string error; 297 base::NativeLibraryLoadError error = 0;
298 base::LoadNativeLibrary(base::FilePath(L"crypt32.dll"), &error); 298 base::LoadNativeLibrary(base::FilePath(L"crypt32.dll"), &error);
ddorwin 2014/03/21 20:06:32 just pass NULL
xhwang 2014/03/21 22:33:28 Done.
299 #endif 299 #endif
300 // Setup initial set of crash dump data for Field Trials in this renderer. 300 // Setup initial set of crash dump data for Field Trials in this renderer.
301 chrome_variations::SetChildProcessLoggingVariationList(); 301 chrome_variations::SetChildProcessLoggingVariationList();
302 } 302 }
303 303
304 ChromeRenderProcessObserver::~ChromeRenderProcessObserver() { 304 ChromeRenderProcessObserver::~ChromeRenderProcessObserver() {
305 } 305 }
306 306
307 bool ChromeRenderProcessObserver::OnControlMessageReceived( 307 bool ChromeRenderProcessObserver::OnControlMessageReceived(
308 const IPC::Message& message) { 308 const IPC::Message& message) {
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 if (clear_cache_pending_ && webkit_initialized_) { 407 if (clear_cache_pending_ && webkit_initialized_) {
408 clear_cache_pending_ = false; 408 clear_cache_pending_ = false;
409 WebCache::clear(); 409 WebCache::clear();
410 } 410 }
411 } 411 }
412 412
413 const RendererContentSettingRules* 413 const RendererContentSettingRules*
414 ChromeRenderProcessObserver::content_setting_rules() const { 414 ChromeRenderProcessObserver::content_setting_rules() const {
415 return &content_setting_rules_; 415 return &content_setting_rules_;
416 } 416 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698