| OLD | NEW |
| 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 "chrome/browser/ui/android/navigation_popup.h" | 5 #include "chrome/browser/ui/android/navigation_popup.h" |
| 6 | 6 |
| 7 #include "base/android/jni_string.h" | 7 #include "base/android/jni_string.h" |
| 8 #include "base/android/scoped_java_ref.h" | 8 #include "base/android/scoped_java_ref.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| 11 #include "chrome/browser/favicon/favicon_service_factory.h" | 11 #include "chrome/browser/favicon/favicon_service_factory.h" |
| 12 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
| 13 #include "chrome/browser/profiles/profile_manager.h" | 13 #include "chrome/browser/profiles/profile_manager.h" |
| 14 #include "chrome/common/url_constants.h" | 14 #include "chrome/common/url_constants.h" |
| 15 #include "components/favicon/core/browser/favicon_service.h" | 15 #include "components/favicon/core/favicon_service.h" |
| 16 #include "components/history/core/browser/history_types.h" | 16 #include "components/history/core/browser/history_types.h" |
| 17 #include "jni/NavigationPopup_jni.h" | 17 #include "jni/NavigationPopup_jni.h" |
| 18 #include "third_party/skia/include/core/SkBitmap.h" | 18 #include "third_party/skia/include/core/SkBitmap.h" |
| 19 #include "ui/base/resource/resource_bundle.h" | 19 #include "ui/base/resource/resource_bundle.h" |
| 20 #include "ui/gfx/android/java_bitmap.h" | 20 #include "ui/gfx/android/java_bitmap.h" |
| 21 #include "ui/gfx/image/image.h" | 21 #include "ui/gfx/image/image.h" |
| 22 #include "ui/resources/grit/ui_resources.h" | 22 #include "ui/resources/grit/ui_resources.h" |
| 23 #include "url/gurl.h" | 23 #include "url/gurl.h" |
| 24 | 24 |
| 25 using base::android::ConvertUTF8ToJavaString; | 25 using base::android::ConvertUTF8ToJavaString; |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 | 85 |
| 86 static jlong Init(JNIEnv* env, jobject obj) { | 86 static jlong Init(JNIEnv* env, jobject obj) { |
| 87 NavigationPopup* popup = new NavigationPopup(env, obj); | 87 NavigationPopup* popup = new NavigationPopup(env, obj); |
| 88 return reinterpret_cast<intptr_t>(popup); | 88 return reinterpret_cast<intptr_t>(popup); |
| 89 } | 89 } |
| 90 | 90 |
| 91 // static | 91 // static |
| 92 bool NavigationPopup::RegisterNavigationPopup(JNIEnv* env) { | 92 bool NavigationPopup::RegisterNavigationPopup(JNIEnv* env) { |
| 93 return RegisterNativesImpl(env); | 93 return RegisterNativesImpl(env); |
| 94 } | 94 } |
| OLD | NEW |