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

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

Issue 3126029: Move the chromium.Interval to chrome.Interval as part of the benchmarking... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: One more missing file!! Created 10 years, 3 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/render_thread.h" 5 #include "chrome/renderer/render_thread.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" 80 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
81 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h" 81 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
82 #include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.h" 82 #include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.h"
83 #include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h" 83 #include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h"
84 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h" 84 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h"
85 #include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.h" 85 #include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.h"
86 #include "third_party/WebKit/WebKit/chromium/public/WebString.h" 86 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
87 #include "third_party/WebKit/WebKit/chromium/public/WebView.h" 87 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
88 #include "webkit/extensions/v8/benchmarking_extension.h" 88 #include "webkit/extensions/v8/benchmarking_extension.h"
89 #include "webkit/extensions/v8/gears_extension.h" 89 #include "webkit/extensions/v8/gears_extension.h"
90 #include "webkit/extensions/v8/interval_extension.h"
91 #include "webkit/extensions/v8/playback_extension.h" 90 #include "webkit/extensions/v8/playback_extension.h"
92 #include "v8/include/v8.h" 91 #include "v8/include/v8.h"
93 92
94 #if defined(OS_WIN) 93 #if defined(OS_WIN)
95 #include <windows.h> 94 #include <windows.h>
96 #include <objbase.h> 95 #include <objbase.h>
97 #endif 96 #endif
98 97
99 #if defined(OS_MACOSX) 98 #if defined(OS_MACOSX)
100 #include "chrome/app/breakpad_mac.h" 99 #include "chrome/app/breakpad_mac.h"
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 846
848 // chrome-extension: resources shouldn't trigger insecure content warnings. 847 // chrome-extension: resources shouldn't trigger insecure content warnings.
849 WebString extension_scheme(ASCIIToUTF16(chrome::kExtensionScheme)); 848 WebString extension_scheme(ASCIIToUTF16(chrome::kExtensionScheme));
850 WebSecurityPolicy::registerURLSchemeAsSecure(extension_scheme); 849 WebSecurityPolicy::registerURLSchemeAsSecure(extension_scheme);
851 850
852 #if defined(OS_WIN) 851 #if defined(OS_WIN)
853 // We don't yet support Gears on non-Windows, so don't tell pages that we do. 852 // We don't yet support Gears on non-Windows, so don't tell pages that we do.
854 WebScriptController::registerExtension(extensions_v8::GearsExtension::Get()); 853 WebScriptController::registerExtension(extensions_v8::GearsExtension::Get());
855 #endif 854 #endif
856 WebScriptController::registerExtension( 855 WebScriptController::registerExtension(
857 extensions_v8::IntervalExtension::Get());
858 WebScriptController::registerExtension(
859 extensions_v8::LoadTimesExtension::Get()); 856 extensions_v8::LoadTimesExtension::Get());
860 WebScriptController::registerExtension( 857 WebScriptController::registerExtension(
861 extensions_v8::ExternalExtension::Get()); 858 extensions_v8::ExternalExtension::Get());
862 859
863 const WebKit::WebString kExtensionScheme = 860 const WebKit::WebString kExtensionScheme =
864 WebKit::WebString::fromUTF8(chrome::kExtensionScheme); 861 WebKit::WebString::fromUTF8(chrome::kExtensionScheme);
865 862
866 WebScriptController::registerExtension( 863 WebScriptController::registerExtension(
867 ExtensionProcessBindings::Get(), kExtensionScheme); 864 ExtensionProcessBindings::Get(), kExtensionScheme);
868 865
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
1108 1105
1109 scoped_refptr<base::MessageLoopProxy> 1106 scoped_refptr<base::MessageLoopProxy>
1110 RenderThread::GetFileThreadMessageLoopProxy() { 1107 RenderThread::GetFileThreadMessageLoopProxy() {
1111 DCHECK(message_loop() == MessageLoop::current()); 1108 DCHECK(message_loop() == MessageLoop::current());
1112 if (!file_thread_.get()) { 1109 if (!file_thread_.get()) {
1113 file_thread_.reset(new base::Thread("Renderer::FILE")); 1110 file_thread_.reset(new base::Thread("Renderer::FILE"));
1114 file_thread_->Start(); 1111 file_thread_->Start();
1115 } 1112 }
1116 return file_thread_->message_loop_proxy(); 1113 return file_thread_->message_loop_proxy();
1117 } 1114 }
OLDNEW
« no previous file with comments | « chrome/common/extensions/docs/examples/api/messaging/timer/popup.html ('k') | webkit/extensions/v8/benchmarking_extension.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698