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

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

Issue 10836031: Remove Instant v1 API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
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_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "chrome/renderer/playback_extension.h" 51 #include "chrome/renderer/playback_extension.h"
52 #include "chrome/renderer/plugins/plugin_placeholder.h" 52 #include "chrome/renderer/plugins/plugin_placeholder.h"
53 #include "chrome/renderer/plugins/plugin_uma.h" 53 #include "chrome/renderer/plugins/plugin_uma.h"
54 #include "chrome/renderer/prerender/prerender_dispatcher.h" 54 #include "chrome/renderer/prerender/prerender_dispatcher.h"
55 #include "chrome/renderer/prerender/prerender_helper.h" 55 #include "chrome/renderer/prerender/prerender_helper.h"
56 #include "chrome/renderer/prerender/prerender_webmediaplayer.h" 56 #include "chrome/renderer/prerender/prerender_webmediaplayer.h"
57 #include "chrome/renderer/prerender/prerenderer_client.h" 57 #include "chrome/renderer/prerender/prerenderer_client.h"
58 #include "chrome/renderer/print_web_view_helper.h" 58 #include "chrome/renderer/print_web_view_helper.h"
59 #include "chrome/renderer/safe_browsing/malware_dom_details.h" 59 #include "chrome/renderer/safe_browsing/malware_dom_details.h"
60 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h" 60 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
61 #include "chrome/renderer/search_extension.h"
62 #include "chrome/renderer/searchbox.h" 61 #include "chrome/renderer/searchbox.h"
63 #include "chrome/renderer/searchbox_extension.h" 62 #include "chrome/renderer/searchbox_extension.h"
64 #include "chrome/renderer/spellchecker/spellcheck.h" 63 #include "chrome/renderer/spellchecker/spellcheck.h"
65 #include "chrome/renderer/spellchecker/spellcheck_provider.h" 64 #include "chrome/renderer/spellchecker/spellcheck_provider.h"
66 #include "chrome/renderer/translate_helper.h" 65 #include "chrome/renderer/translate_helper.h"
67 #include "chrome/renderer/visitedlink_slave.h" 66 #include "chrome/renderer/visitedlink_slave.h"
68 #include "content/public/common/content_constants.h" 67 #include "content/public/common/content_constants.h"
69 #include "content/public/renderer/render_thread.h" 68 #include "content/public/renderer/render_thread.h"
70 #include "content/public/renderer/render_view.h" 69 #include "content/public/renderer/render_view.h"
71 #include "grit/generated_resources.h" 70 #include "grit/generated_resources.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 #if defined(ENABLE_SAFE_BROWSING) 169 #if defined(ENABLE_SAFE_BROWSING)
171 thread->AddObserver(phishing_classifier_.get()); 170 thread->AddObserver(phishing_classifier_.get());
172 #endif 171 #endif
173 thread->AddObserver(spellcheck_.get()); 172 thread->AddObserver(spellcheck_.get());
174 thread->AddObserver(visited_link_slave_.get()); 173 thread->AddObserver(visited_link_slave_.get());
175 thread->AddObserver(prerender_dispatcher_.get()); 174 thread->AddObserver(prerender_dispatcher_.get());
176 175
177 thread->RegisterExtension(extensions_v8::ExternalExtension::Get()); 176 thread->RegisterExtension(extensions_v8::ExternalExtension::Get());
178 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get()); 177 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get());
179 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get()); 178 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get());
180 v8::Extension* search_extension = extensions_v8::SearchExtension::Get();
181 // search_extension is null if not enabled.
182 if (search_extension)
183 thread->RegisterExtension(search_extension);
184 179
185 CommandLine* command_line = CommandLine::ForCurrentProcess(); 180 CommandLine* command_line = CommandLine::ForCurrentProcess();
186 if (command_line->HasSwitch(switches::kEnableBenchmarking)) 181 if (command_line->HasSwitch(switches::kEnableBenchmarking))
187 thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get()); 182 thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get());
188 183
189 if (command_line->HasSwitch(switches::kPlaybackMode) || 184 if (command_line->HasSwitch(switches::kPlaybackMode) ||
190 command_line->HasSwitch(switches::kRecordMode) || 185 command_line->HasSwitch(switches::kRecordMode) ||
191 command_line->HasSwitch(switches::kNoJsRandomness)) { 186 command_line->HasSwitch(switches::kNoJsRandomness)) {
192 thread->RegisterExtension(extensions_v8::PlaybackExtension::Get()); 187 thread->RegisterExtension(extensions_v8::PlaybackExtension::Get());
193 } 188 }
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
940 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() { 935 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
941 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled(); 936 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
942 } 937 }
943 938
944 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( 939 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
945 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { 940 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
946 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 941 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
947 } 942 }
948 943
949 } // namespace chrome 944 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698