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

Side by Side Diff: content/browser/android/java/gin_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/gin_java_bridge_dispatcher_host.h" 5 #include "content/browser/android/java/gin_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/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/scoped_java_ref.h" 9 #include "base/android/scoped_java_ref.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #include "base/strings/string_number_conversions.h" 11 #include "base/strings/string_number_conversions.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "base/task_runner_util.h" 13 #include "base/task_runner_util.h"
14 #include "content/browser/renderer_host/java/gin_java_bound_object_delegate.h" 14 #include "content/browser/android/java/gin_java_bound_object_delegate.h"
15 #include "content/browser/renderer_host/java/jni_helper.h" 15 #include "content/browser/android/java/jni_helper.h"
16 #include "content/common/android/gin_java_bridge_value.h" 16 #include "content/common/android/gin_java_bridge_value.h"
17 #include "content/common/android/hash_set.h" 17 #include "content/common/android/hash_set.h"
18 #include "content/common/gin_java_bridge_messages.h" 18 #include "content/common/gin_java_bridge_messages.h"
19 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
20 #include "content/public/browser/render_frame_host.h" 20 #include "content/public/browser/render_frame_host.h"
21 #include "ipc/ipc_message_utils.h" 21 #include "ipc/ipc_message_utils.h"
22 22
23 #if !defined(OS_ANDROID) 23 #if !defined(OS_ANDROID)
24 #error "JavaBridge only supports OS_ANDROID" 24 #error "JavaBridge only supports OS_ANDROID"
25 #endif 25 #endif
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 if (objects_.Lookup(object_id)) { 488 if (objects_.Lookup(object_id)) {
489 GinJavaBoundObject::ObjectMap::iterator iter(&objects_); 489 GinJavaBoundObject::ObjectMap::iterator iter(&objects_);
490 while (!iter.IsAtEnd() && iter.GetCurrentKey() != object_id) 490 while (!iter.IsAtEnd() && iter.GetCurrentKey() != object_id)
491 iter.Advance(); 491 iter.Advance();
492 DCHECK(!iter.IsAtEnd()); 492 DCHECK(!iter.IsAtEnd());
493 RemoveHolder(render_frame_host, iter, 1); 493 RemoveHolder(render_frame_host, iter, 1);
494 } 494 }
495 } 495 }
496 496
497 } // namespace content 497 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698