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

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

Issue 6532069: Reland "WebUI: Move more files from chrome/browser/dom_ui to chrome/browser/webui. Part 5." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 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 | « chrome/browser/webui/remoting_ui.cc ('k') | chrome/browser/webui/web_ui_factory.cc » ('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 "chrome/browser/webui/web_ui.h" 5 #include "chrome/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/dom_ui/generic_handler.h"
14 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/renderer_host/render_view_host.h" 14 #include "chrome/browser/renderer_host/render_view_host.h"
16 #include "chrome/browser/tab_contents/tab_contents.h" 15 #include "chrome/browser/tab_contents/tab_contents.h"
17 #include "chrome/browser/tab_contents/tab_contents_view.h" 16 #include "chrome/browser/tab_contents/tab_contents_view.h"
18 #include "chrome/browser/themes/browser_theme_provider.h" 17 #include "chrome/browser/themes/browser_theme_provider.h"
18 #include "chrome/browser/webui/generic_handler.h"
19 #include "chrome/common/bindings_policy.h" 19 #include "chrome/common/bindings_policy.h"
20 #include "chrome/common/render_messages.h" 20 #include "chrome/common/render_messages.h"
21 #include "chrome/common/render_messages_params.h" 21 #include "chrome/common/render_messages_params.h"
22 22
23 namespace { 23 namespace {
24 24
25 std::wstring GetJavascript(const std::wstring& function_name, 25 std::wstring GetJavascript(const std::wstring& function_name,
26 const std::vector<const Value*>& arg_list) { 26 const std::vector<const Value*>& arg_list) {
27 std::wstring parameters; 27 std::wstring parameters;
28 std::string json; 28 std::string json;
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 } 208 }
209 209
210 // TODO(viettrungluu): convert to string16 (or UTF-8 std::string?). 210 // TODO(viettrungluu): convert to string16 (or UTF-8 std::string?).
211 std::wstring WebUIMessageHandler::ExtractStringValue(const ListValue* value) { 211 std::wstring WebUIMessageHandler::ExtractStringValue(const ListValue* value) {
212 string16 string16_value; 212 string16 string16_value;
213 if (value->GetString(0, &string16_value)) 213 if (value->GetString(0, &string16_value))
214 return UTF16ToWideHack(string16_value); 214 return UTF16ToWideHack(string16_value);
215 NOTREACHED(); 215 NOTREACHED();
216 return std::wstring(); 216 return std::wstring();
217 } 217 }
OLDNEW
« no previous file with comments | « chrome/browser/webui/remoting_ui.cc ('k') | chrome/browser/webui/web_ui_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698