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

Side by Side Diff: content/browser/android/java/java_bridge_dispatcher_host.cc

Issue 336313018: [Android] Move content/browser/{renderer_host => android}/java/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updated paths for unit tests, rebased Created 6 years, 5 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/java/java_bridge_dispatcher_host.h" 5 #include "content/browser/android/java/java_bridge_dispatcher_host.h"
6 6
7 #include "base/android/java_handler_thread.h" 7 #include "base/android/java_handler_thread.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "content/browser/renderer_host/java/java_bridge_channel_host.h" 10 #include "content/browser/android/java/java_bridge_channel_host.h"
11 #include "content/child/child_process.h" 11 #include "content/child/child_process.h"
12 #include "content/child/npapi/npobject_stub.h" 12 #include "content/child/npapi/npobject_stub.h"
13 #include "content/child/npapi/npobject_util.h" // For CreateNPVariantParam() 13 #include "content/child/npapi/npobject_util.h" // For CreateNPVariantParam()
14 #include "content/common/java_bridge_messages.h" 14 #include "content/common/java_bridge_messages.h"
15 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
16 #include "content/public/browser/render_frame_host.h" 16 #include "content/public/browser/render_frame_host.h"
17 #include "content/public/browser/render_process_host.h" 17 #include "content/public/browser/render_process_host.h"
18 #include "third_party/WebKit/public/web/WebBindings.h" 18 #include "third_party/WebKit/public/web/WebBindings.h"
19 19
20 #if !defined(OS_ANDROID) 20 #if !defined(OS_ANDROID)
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 // functionality. The page URL is also not required. 158 // functionality. The page URL is also not required.
159 stubs_.push_back((new NPObjectStub( 159 stubs_.push_back((new NPObjectStub(
160 object, channel_.get(), route_id, 0, GURL()))->AsWeakPtr()); 160 object, channel_.get(), route_id, 0, GURL()))->AsWeakPtr());
161 161
162 // The NPObjectStub takes a reference to the NPObject. Release the ref added 162 // The NPObjectStub takes a reference to the NPObject. Release the ref added
163 // in CreateNPVariantParam(). 163 // in CreateNPVariantParam().
164 blink::WebBindings::releaseObject(object); 164 blink::WebBindings::releaseObject(object);
165 } 165 }
166 166
167 } // namespace content 167 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698