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

Side by Side Diff: content/browser/webui/web_ui_impl.cc

Issue 11273049: Revert 164120 - content/browser: Move more files into the content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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 "content/browser/webui/web_ui_impl.h" 5 #include "content/browser/webui/web_ui_impl.h"
6 6
7 #include "base/json/json_writer.h" 7 #include "base/json/json_writer.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "content/browser/child_process_security_policy_impl.h" 11 #include "content/browser/child_process_security_policy_impl.h"
12 #include "content/browser/renderer_host/dip_util.h" 12 #include "content/browser/renderer_host/dip_util.h"
13 #include "content/browser/renderer_host/render_process_host_impl.h" 13 #include "content/browser/renderer_host/render_process_host_impl.h"
14 #include "content/browser/renderer_host/render_view_host_impl.h" 14 #include "content/browser/renderer_host/render_view_host_impl.h"
15 #include "content/browser/web_contents/web_contents_impl.h" 15 #include "content/browser/web_contents/web_contents_impl.h"
16 #include "content/common/view_messages.h" 16 #include "content/common/view_messages.h"
17 #include "content/public/browser/content_browser_client.h" 17 #include "content/public/browser/content_browser_client.h"
18 #include "content/public/browser/web_contents_delegate.h" 18 #include "content/public/browser/web_contents_delegate.h"
19 #include "content/public/browser/web_contents_view.h" 19 #include "content/public/browser/web_contents_view.h"
20 #include "content/public/browser/web_ui_controller.h" 20 #include "content/public/browser/web_ui_controller.h"
21 #include "content/public/browser/web_ui_controller_factory.h" 21 #include "content/public/browser/web_ui_controller_factory.h"
22 #include "content/public/browser/web_ui_message_handler.h" 22 #include "content/public/browser/web_ui_message_handler.h"
23 #include "content/public/common/bindings_policy.h" 23 #include "content/public/common/bindings_policy.h"
24 #include "content/public/common/content_client.h" 24 #include "content/public/common/content_client.h"
25 25
26 using content::ChildProcessSecurityPolicyImpl;
27 using content::RenderViewHostImpl; 26 using content::RenderViewHostImpl;
28 using content::WebContents; 27 using content::WebContents;
29 using content::WebUIController; 28 using content::WebUIController;
30 using content::WebUIMessageHandler; 29 using content::WebUIMessageHandler;
31 30
32 namespace content { 31 namespace content {
33 32
34 const WebUI::TypeID WebUI::kNoWebUI = NULL; 33 const WebUI::TypeID WebUI::kNoWebUI = NULL;
35 34
36 // static 35 // static
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 handler->set_web_ui(this); 265 handler->set_web_ui(this);
267 handler->RegisterMessages(); 266 handler->RegisterMessages();
268 handlers_.push_back(handler); 267 handlers_.push_back(handler);
269 } 268 }
270 269
271 void WebUIImpl::ExecuteJavascript(const string16& javascript) { 270 void WebUIImpl::ExecuteJavascript(const string16& javascript) {
272 static_cast<RenderViewHostImpl*>( 271 static_cast<RenderViewHostImpl*>(
273 web_contents_->GetRenderViewHost())->ExecuteJavascriptInWebFrame( 272 web_contents_->GetRenderViewHost())->ExecuteJavascriptInWebFrame(
274 ASCIIToUTF16(frame_xpath_), javascript); 273 ASCIIToUTF16(frame_xpath_), javascript);
275 } 274 }
OLDNEW
« no previous file with comments | « content/browser/trace_subscriber_stdio_unittest.cc ('k') | content/public/test/test_content_client_initializer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698