content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h - Issue 102593002: Convert string16 to base::string16 in content.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h

Issue 102593002: Convert string16 to base::string16 in content. (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 | « content/browser/renderer_host/java/java_bridge_dispatcher_host.cc ('k') | content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h

diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h b/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h

index e3d629af374bd115c323606dfbe2276b245df4ad..29523b57396fe2485baedda8d01f92c86807393b 100644

--- a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h

+++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h

@@ -34,8 +34,8 @@ class JavaBridgeDispatcherHostManager

// These methods add or remove the object to each JavaBridgeDispatcherHost.

// Each one holds a reference to the NPObject while the object is bound to

// the corresponding RenderView. See JavaBridgeDispatcherHost for details.

- void AddNamedObject(const string16& name, NPObject* object);

- void RemoveNamedObject(const string16& name);

+ void AddNamedObject(const base::string16& name, NPObject* object);

+ void RemoveNamedObject(const base::string16& name);

void OnGetChannelHandle(RenderViewHost* render_view_host,

IPC::Message* reply_msg);

@@ -60,7 +60,7 @@ class JavaBridgeDispatcherHostManager

typedef std::map<RenderViewHost*, scoped_refptr<JavaBridgeDispatcherHost> >

InstanceMap;

InstanceMap instances_;

- typedef std::map<string16, NPObject*> ObjectMap;

+ typedef std::map<base::string16, NPObject*> ObjectMap;

ObjectMap objects_;

JavaObjectWeakGlobalRef retained_object_set_;