| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/android/bottombar/overlay_panel_content.h" | 5 #include "chrome/browser/android/bottombar/overlay_panel_content.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| 11 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
| 12 #include "base/memory/weak_ptr.h" | 12 #include "base/memory/weak_ptr.h" |
| 13 #include "base/time/time.h" | 13 #include "base/time/time.h" |
| 14 #include "chrome/browser/android/tab_android.h" | 14 #include "chrome/browser/android/tab_android.h" |
| 15 #include "chrome/browser/history/history_service_factory.h" | 15 #include "chrome/browser/history/history_service_factory.h" |
| 16 #include "chrome/browser/profiles/profile_manager.h" | 16 #include "chrome/browser/profiles/profile_manager.h" |
| 17 #include "chrome/browser/search_engines/template_url_service_factory.h" | 17 #include "chrome/browser/search_engines/template_url_service_factory.h" |
| 18 #include "chrome/browser/ui/android/view_android_helper.h" | 18 #include "chrome/browser/ui/android/view_android_helper.h" |
| 19 #include "components/history/core/browser/history_service.h" | 19 #include "components/history/core/browser/history_service.h" |
| 20 #include "components/navigation_interception/intercept_navigation_delegate.h" | 20 #include "components/navigation_interception/intercept_navigation_delegate.h" |
| 21 #include "components/variations/variations_associated_data.h" | 21 #include "components/variations/variations_associated_data.h" |
| 22 #include "components/web_contents_delegate_android/web_contents_delegate_android
.h" | 22 #include "components/web_contents_delegate_android/web_contents_delegate_android
.h" |
| 23 #include "content/public/browser/android/content_view_core.h" | 23 #include "content/public/browser/android/content_view_core.h" |
| 24 #include "content/public/browser/web_contents.h" | 24 #include "content/public/browser/web_contents.h" |
| 25 #include "jni/OverlayPanelContent_jni.h" | 25 #include "jni/OverlayPanelContent_jni.h" |
| 26 #include "net/url_request/url_fetcher_impl.h" | 26 #include "net/url_request/url_fetcher_impl.h" |
| 27 | 27 |
| 28 using base::android::JavaParamRef; |
| 28 using content::ContentViewCore; | 29 using content::ContentViewCore; |
| 29 | 30 |
| 30 namespace { | 31 namespace { |
| 31 | 32 |
| 32 const int kHistoryDeletionWindowSeconds = 2; | 33 const int kHistoryDeletionWindowSeconds = 2; |
| 33 | 34 |
| 34 // Because we need a callback, this needs to exist. | 35 // Because we need a callback, this needs to exist. |
| 35 void OnHistoryDeletionDone() { | 36 void OnHistoryDeletionDone() { |
| 36 } | 37 } |
| 37 | 38 |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 } | 136 } |
| 136 | 137 |
| 137 bool RegisterOverlayPanelContent(JNIEnv* env) { | 138 bool RegisterOverlayPanelContent(JNIEnv* env) { |
| 138 return RegisterNativesImpl(env); | 139 return RegisterNativesImpl(env); |
| 139 } | 140 } |
| 140 | 141 |
| 141 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 142 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
| 142 OverlayPanelContent* content = new OverlayPanelContent(env, obj); | 143 OverlayPanelContent* content = new OverlayPanelContent(env, obj); |
| 143 return reinterpret_cast<intptr_t>(content); | 144 return reinterpret_cast<intptr_t>(content); |
| 144 } | 145 } |
| OLD | NEW |