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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1200503002: [Extensions] Kill off ExtensionMsg_AddMessageToConsole (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Latest master Created 5 years, 5 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1333 matching lines...) Expand 10 before | Expand all | Expand 10 after
1344 1344
1345 frame_->replaceMisspelledRange(text); 1345 frame_->replaceMisspelledRange(text);
1346 } 1346 }
1347 1347
1348 void RenderFrameImpl::OnCSSInsertRequest(const std::string& css) { 1348 void RenderFrameImpl::OnCSSInsertRequest(const std::string& css) {
1349 frame_->document().insertStyleSheet(WebString::fromUTF8(css)); 1349 frame_->document().insertStyleSheet(WebString::fromUTF8(css));
1350 } 1350 }
1351 1351
1352 void RenderFrameImpl::OnAddMessageToConsole(ConsoleMessageLevel level, 1352 void RenderFrameImpl::OnAddMessageToConsole(ConsoleMessageLevel level,
1353 const std::string& message) { 1353 const std::string& message) {
1354 if (devtools_agent_) 1354 AddMessageToConsole(level, message);
1355 devtools_agent_->AddMessageToConsole(level, message);
1356 } 1355 }
1357 1356
1358 void RenderFrameImpl::OnJavaScriptExecuteRequest( 1357 void RenderFrameImpl::OnJavaScriptExecuteRequest(
1359 const base::string16& jscript, 1358 const base::string16& jscript,
1360 int id, 1359 int id,
1361 bool notify_result) { 1360 bool notify_result) {
1362 TRACE_EVENT_INSTANT0("test_tracing", "OnJavaScriptExecuteRequest", 1361 TRACE_EVENT_INSTANT0("test_tracing", "OnJavaScriptExecuteRequest",
1363 TRACE_EVENT_SCOPE_THREAD); 1362 TRACE_EVENT_SCOPE_THREAD);
1364 1363
1365 v8::HandleScope handle_scope(v8::Isolate::GetCurrent()); 1364 v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
1888 isolate, mojo::js::Core::kModuleName, mojo::js::Core::GetModule(isolate)); 1887 isolate, mojo::js::Core::kModuleName, mojo::js::Core::GetModule(isolate));
1889 registry->AddBuiltinModule(isolate, 1888 registry->AddBuiltinModule(isolate,
1890 mojo::js::Support::kModuleName, 1889 mojo::js::Support::kModuleName,
1891 mojo::js::Support::GetModule(isolate)); 1890 mojo::js::Support::GetModule(isolate));
1892 registry->AddBuiltinModule( 1891 registry->AddBuiltinModule(
1893 isolate, 1892 isolate,
1894 ServiceRegistryJsWrapper::kModuleName, 1893 ServiceRegistryJsWrapper::kModuleName,
1895 ServiceRegistryJsWrapper::Create(isolate, &service_registry_).ToV8()); 1894 ServiceRegistryJsWrapper::Create(isolate, &service_registry_).ToV8());
1896 } 1895 }
1897 1896
1897 void RenderFrameImpl::AddMessageToConsole(ConsoleMessageLevel level,
1898 const std::string& message) {
1899 if (devtools_agent_)
1900 devtools_agent_->AddMessageToConsole(level, message);
1901 }
1902
1898 // blink::WebFrameClient implementation ---------------------------------------- 1903 // blink::WebFrameClient implementation ----------------------------------------
1899 1904
1900 blink::WebPluginPlaceholder* RenderFrameImpl::createPluginPlaceholder( 1905 blink::WebPluginPlaceholder* RenderFrameImpl::createPluginPlaceholder(
1901 blink::WebLocalFrame* frame, 1906 blink::WebLocalFrame* frame,
1902 const blink::WebPluginParams& params) { 1907 const blink::WebPluginParams& params) {
1903 DCHECK_EQ(frame_, frame); 1908 DCHECK_EQ(frame_, frame);
1904 return GetContentClient() 1909 return GetContentClient()
1905 ->renderer() 1910 ->renderer()
1906 ->CreatePluginPlaceholder(this, frame, params) 1911 ->CreatePluginPlaceholder(this, frame, params)
1907 .release(); 1912 .release();
(...skipping 3064 matching lines...) Expand 10 before | Expand all | Expand 10 after
4972 #elif defined(ENABLE_BROWSER_CDMS) 4977 #elif defined(ENABLE_BROWSER_CDMS)
4973 cdm_manager_, 4978 cdm_manager_,
4974 #endif 4979 #endif
4975 this); 4980 this);
4976 } 4981 }
4977 4982
4978 return cdm_factory_; 4983 return cdm_factory_;
4979 } 4984 }
4980 4985
4981 } // namespace content 4986 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | extensions/browser/api/alarms/alarms_api_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698