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

Side by Side Diff: content/ppapi_plugin/ppapi_thread.cc

Issue 1642213002: Move font_warmup_win, fix webrtc dep. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 (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/ppapi_plugin/ppapi_thread.h" 5 #include "content/ppapi_plugin/ppapi_thread.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <limits> 9 #include <limits>
10 10
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "ppapi/proxy/plugin_globals.h" 48 #include "ppapi/proxy/plugin_globals.h"
49 #include "ppapi/proxy/plugin_message_filter.h" 49 #include "ppapi/proxy/plugin_message_filter.h"
50 #include "ppapi/proxy/ppapi_messages.h" 50 #include "ppapi/proxy/ppapi_messages.h"
51 #include "ppapi/proxy/resource_reply_thread_registrar.h" 51 #include "ppapi/proxy/resource_reply_thread_registrar.h"
52 #include "third_party/WebKit/public/web/WebKit.h" 52 #include "third_party/WebKit/public/web/WebKit.h"
53 #include "ui/base/ui_base_switches.h" 53 #include "ui/base/ui_base_switches.h"
54 54
55 #if defined(OS_WIN) 55 #if defined(OS_WIN)
56 #include "base/win/win_util.h" 56 #include "base/win/win_util.h"
57 #include "base/win/windows_version.h" 57 #include "base/win/windows_version.h"
58 #include "content/common/font_warmup_win.h" 58 #include "content/child/font_warmup_win.h"
59 #include "sandbox/win/src/sandbox.h" 59 #include "sandbox/win/src/sandbox.h"
60 #elif defined(OS_MACOSX) 60 #elif defined(OS_MACOSX)
61 #include "content/common/sandbox_init_mac.h" 61 #include "content/common/sandbox_init_mac.h"
62 #endif 62 #endif
63 63
64 #if defined(OS_WIN) 64 #if defined(OS_WIN)
65 const char kWidevineCdmAdapterFileName[] = "widevinecdmadapter.dll"; 65 const char kWidevineCdmAdapterFileName[] = "widevinecdmadapter.dll";
66 66
67 extern sandbox::TargetServices* g_target_services; 67 extern sandbox::TargetServices* g_target_services;
68 68
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 GetHistogramName(is_broker_, "LoadTime", path), 622 GetHistogramName(is_broker_, "LoadTime", path),
623 base::TimeDelta::FromMilliseconds(1), 623 base::TimeDelta::FromMilliseconds(1),
624 base::TimeDelta::FromSeconds(10), 624 base::TimeDelta::FromSeconds(10),
625 50, 625 50,
626 base::HistogramBase::kUmaTargetedHistogramFlag); 626 base::HistogramBase::kUmaTargetedHistogramFlag);
627 627
628 histogram->AddTime(load_time); 628 histogram->AddTime(load_time);
629 } 629 }
630 630
631 } // namespace content 631 } // namespace content
OLDNEW
« no previous file with comments | « content/ppapi_plugin/ppapi_plugin_main.cc ('k') | content/renderer/renderer_main_platform_delegate_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698