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

Side by Side Diff: content/browser/renderer_host/render_view_host.cc

Issue 7598020: content: use string16 in ViewHostMsg_AddMessageToConsole (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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
« no previous file with comments | « content/browser/renderer_host/render_view_host.h ('k') | content/common/view_messages.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/renderer_host/render_view_host.h" 5 #include "content/browser/renderer_host/render_view_host.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1065 matching lines...) Expand 10 before | Expand all | Expand 10 after
1076 NotificationService::NoDetails()); 1076 NotificationService::NoDetails());
1077 } 1077 }
1078 1078
1079 void RenderViewHost::OnTakeFocus(bool reverse) { 1079 void RenderViewHost::OnTakeFocus(bool reverse) {
1080 RenderViewHostDelegate::View* view = delegate_->GetViewDelegate(); 1080 RenderViewHostDelegate::View* view = delegate_->GetViewDelegate();
1081 if (view) 1081 if (view)
1082 view->TakeFocus(reverse); 1082 view->TakeFocus(reverse);
1083 } 1083 }
1084 1084
1085 void RenderViewHost::OnAddMessageToConsole(int32 level, 1085 void RenderViewHost::OnAddMessageToConsole(int32 level,
1086 const std::wstring& message, 1086 const string16& message,
1087 int32 line_no, 1087 int32 line_no,
1088 const std::wstring& source_id) { 1088 const string16& source_id) {
1089 // Pass through log level only on WebUI pages to limit console spew. 1089 // Pass through log level only on WebUI pages to limit console spew.
1090 int32 resolved_level = 1090 int32 resolved_level =
1091 BindingsPolicy::is_web_ui_enabled(enabled_bindings_) ? level : 0; 1091 BindingsPolicy::is_web_ui_enabled(enabled_bindings_) ? level : 0;
1092 1092
1093 logging::LogMessage("CONSOLE", line_no, resolved_level).stream() << "\"" << 1093 logging::LogMessage("CONSOLE", line_no, resolved_level).stream() << "\"" <<
1094 message << "\", source: " << source_id << " (" << line_no << ")"; 1094 message << "\", source: " << source_id << " (" << line_no << ")";
1095 } 1095 }
1096 1096
1097 void RenderViewHost::AddObserver(RenderViewHostObserver* observer) { 1097 void RenderViewHost::AddObserver(RenderViewHostObserver* observer) {
1098 observers_.AddObserver(observer); 1098 observers_.AddObserver(observer);
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
1332 if (view) { 1332 if (view) {
1333 view->ShowPopupMenu(params.bounds, 1333 view->ShowPopupMenu(params.bounds,
1334 params.item_height, 1334 params.item_height,
1335 params.item_font_size, 1335 params.item_font_size,
1336 params.selected_item, 1336 params.selected_item,
1337 params.popup_items, 1337 params.popup_items,
1338 params.right_aligned); 1338 params.right_aligned);
1339 } 1339 }
1340 } 1340 }
1341 #endif 1341 #endif
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_view_host.h ('k') | content/common/view_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698