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

Unified Diff: chrome/renderer/chrome_render_view_observer.cc

Issue 105493002: Use base namespace for string16 in chrome/renderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/chrome_render_view_observer.h ('k') | chrome/renderer/extensions/extension_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_render_view_observer.cc
diff --git a/chrome/renderer/chrome_render_view_observer.cc b/chrome/renderer/chrome_render_view_observer.cc
index 9bb2e1f43e02c276882068e5dc30b350ea0ce1ba..85d040a68b4869997dd47bddf0a089c60ba87f74 100644
--- a/chrome/renderer/chrome_render_view_observer.cc
+++ b/chrome/renderer/chrome_render_view_observer.cc
@@ -56,7 +56,6 @@
#include "ui/gfx/skbitmap_operations.h"
#include "v8/include/v8-testing.h"
-using base::string16;
using extensions::APIPermission;
using blink::WebAXObject;
using blink::WebCString;
@@ -224,16 +223,17 @@ const char kStackFrameDelimiter[] = "\n at ";
// the given line number and source.
// |message| will be populated with the error message only (i.e., will not
// include any stack trace).
-extensions::StackTrace GetStackTraceFromMessage(string16* message,
- const string16& source,
- const string16& stack_trace,
- int32 line_number) {
+extensions::StackTrace GetStackTraceFromMessage(
+ base::string16* message,
+ const base::string16& source,
+ const base::string16& stack_trace,
+ int32 line_number) {
extensions::StackTrace result;
std::vector<base::string16> pieces;
size_t index = 0;
if (message->find(base::UTF8ToUTF16(kStackFrameDelimiter)) !=
- string16::npos) {
+ base::string16::npos) {
base::SplitStringUsingSubstr(*message,
base::UTF8ToUTF16(kStackFrameDelimiter),
&pieces);
@@ -331,8 +331,8 @@ bool ChromeRenderViewObserver::OnMessageReceived(const IPC::Message& message) {
}
void ChromeRenderViewObserver::OnWebUIJavaScript(
- const string16& frame_xpath,
- const string16& jscript,
+ const base::string16& frame_xpath,
+ const base::string16& jscript,
int id,
bool notify_result) {
webui_javascript_.reset(new WebUIJavaScript());
@@ -829,7 +829,7 @@ void ChromeRenderViewObserver::DetailedConsoleMessageAdded(
const base::string16& stack_trace_string,
int32 line_number,
int32 severity_level) {
- string16 trimmed_message = message;
+ base::string16 trimmed_message = message;
extensions::StackTrace stack_trace = GetStackTraceFromMessage(
&trimmed_message,
source,
@@ -883,7 +883,7 @@ void ChromeRenderViewObserver::CapturePageInfo(int page_id,
// Retrieve the frame's full text (up to kMaxIndexChars), and pass it to the
// translate helper for language detection and possible translation.
- string16 contents;
+ base::string16 contents;
base::TimeTicks capture_begin_time = base::TimeTicks::Now();
CaptureText(main_frame, &contents);
UMA_HISTOGRAM_TIMES(kTranslateCaptureText,
@@ -934,7 +934,7 @@ void ChromeRenderViewObserver::CapturePageInfo(int page_id,
}
void ChromeRenderViewObserver::CaptureText(WebFrame* frame,
- string16* contents) {
+ base::string16* contents) {
contents->clear();
if (!frame)
return;
« no previous file with comments | « chrome/renderer/chrome_render_view_observer.h ('k') | chrome/renderer/extensions/extension_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698