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

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

Issue 6708114: Revert 79691 - Move WebUIFactory to chrome/browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 8 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
« no previous file with comments | « content/browser/webui/web_ui.h ('k') | content/browser/webui/web_ui_factory.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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.h" 5 #include "content/browser/webui/web_ui.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
9 #include "base/stl_util-inl.h" 9 #include "base/stl_util-inl.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/ui/webui/generic_handler.h"
13 #include "chrome/common/bindings_policy.h" 15 #include "chrome/common/bindings_policy.h"
14 #include "chrome/common/extensions/extension_messages.h" 16 #include "chrome/common/extensions/extension_messages.h"
15 #include "chrome/common/render_messages.h" 17 #include "chrome/common/render_messages.h"
16 #include "content/browser/renderer_host/render_view_host.h" 18 #include "content/browser/renderer_host/render_view_host.h"
17 #include "content/browser/tab_contents/tab_contents.h" 19 #include "content/browser/tab_contents/tab_contents.h"
18 #include "content/browser/tab_contents/tab_contents_view.h" 20 #include "content/browser/tab_contents/tab_contents_view.h"
19 #include "content/browser/webui/generic_handler.h"
20 21
21 namespace { 22 namespace {
22 23
23 string16 GetJavascript(const std::string& function_name, 24 string16 GetJavascript(const std::string& function_name,
24 const std::vector<const Value*>& arg_list) { 25 const std::vector<const Value*>& arg_list) {
25 string16 parameters; 26 string16 parameters;
26 std::string json; 27 std::string json;
27 for (size_t i = 0; i < arg_list.size(); ++i) { 28 for (size_t i = 0; i < arg_list.size(); ++i) {
28 if (i > 0) 29 if (i > 0)
29 parameters += char16(','); 30 parameters += char16(',');
(...skipping 21 matching lines...) Expand all
51 } 52 }
52 53
53 WebUI::~WebUI() { 54 WebUI::~WebUI() {
54 STLDeleteContainerPairSecondPointers(message_callbacks_.begin(), 55 STLDeleteContainerPairSecondPointers(message_callbacks_.begin(),
55 message_callbacks_.end()); 56 message_callbacks_.end());
56 STLDeleteContainerPointers(handlers_.begin(), handlers_.end()); 57 STLDeleteContainerPointers(handlers_.begin(), handlers_.end());
57 } 58 }
58 59
59 // WebUI, public: ------------------------------------------------------------- 60 // WebUI, public: -------------------------------------------------------------
60 61
61 const WebUI::TypeID WebUI::kNoWebUI = NULL;
62
63 void WebUI::ProcessWebUIMessage( 62 void WebUI::ProcessWebUIMessage(
64 const ExtensionHostMsg_DomMessage_Params& params) { 63 const ExtensionHostMsg_DomMessage_Params& params) {
65 // Look up the callback for this message. 64 // Look up the callback for this message.
66 MessageCallbackMap::const_iterator callback = 65 MessageCallbackMap::const_iterator callback =
67 message_callbacks_.find(params.name); 66 message_callbacks_.find(params.name);
68 if (callback == message_callbacks_.end()) 67 if (callback == message_callbacks_.end())
69 return; 68 return;
70 69
71 // Forward this message and content on. 70 // Forward this message and content on.
72 callback->second->Run(&params.arguments); 71 callback->second->Run(&params.arguments);
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 return false; 210 return false;
212 } 211 }
213 212
214 string16 WebUIMessageHandler::ExtractStringValue(const ListValue* value) { 213 string16 WebUIMessageHandler::ExtractStringValue(const ListValue* value) {
215 string16 string16_value; 214 string16 string16_value;
216 if (value->GetString(0, &string16_value)) 215 if (value->GetString(0, &string16_value))
217 return string16_value; 216 return string16_value;
218 NOTREACHED(); 217 NOTREACHED();
219 return string16(); 218 return string16();
220 } 219 }
OLDNEW
« no previous file with comments | « content/browser/webui/web_ui.h ('k') | content/browser/webui/web_ui_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698