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

Side by Side Diff: chrome/browser/android/ntp/most_visited_sites_bridge.cc

Issue 1941713002: Remove most of the dependencies on //chrome/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@g-browser
Patch Set: Created 4 years, 7 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
« no previous file with comments | « chrome/browser/android/ntp/most_visited_sites.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/ntp/most_visited_sites_bridge.h" 5 #include "chrome/browser/android/ntp/most_visited_sites_bridge.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_array.h" 10 #include "base/android/jni_array.h"
11 #include "base/android/jni_string.h" 11 #include "base/android/jni_string.h"
12 #include "base/android/scoped_java_ref.h" 12 #include "base/android/scoped_java_ref.h"
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/callback.h" 14 #include "base/callback.h"
15 #include "chrome/browser/android/ntp/popular_sites.h" 15 #include "chrome/browser/android/ntp/popular_sites.h"
16 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
17 #include "chrome/browser/history/top_sites_factory.h"
18 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/profiles/profile_android.h" 19 #include "chrome/browser/profiles/profile_android.h"
20 #include "chrome/browser/search/suggestions/suggestions_service_factory.h"
21 #include "chrome/browser/search_engines/template_url_service_factory.h"
22 #include "chrome/browser/thumbnails/thumbnail_list_source.h"
23 #include "components/history/core/browser/top_sites.h"
24 #include "content/public/browser/url_data_source.h"
18 #include "jni/MostVisitedSites_jni.h" 25 #include "jni/MostVisitedSites_jni.h"
19 #include "ui/gfx/android/java_bitmap.h" 26 #include "ui/gfx/android/java_bitmap.h"
20 #include "url/gurl.h" 27 #include "url/gurl.h"
21 28
22 using base::android::AttachCurrentThread; 29 using base::android::AttachCurrentThread;
23 using base::android::ConvertJavaStringToUTF8; 30 using base::android::ConvertJavaStringToUTF8;
24 using base::android::ScopedJavaGlobalRef; 31 using base::android::ScopedJavaGlobalRef;
25 using base::android::ScopedJavaLocalRef; 32 using base::android::ScopedJavaLocalRef;
26 using base::android::ToJavaArrayOfStrings; 33 using base::android::ToJavaArrayOfStrings;
34 using suggestions::SuggestionsServiceFactory;
27 35
28 namespace { 36 namespace {
29 37
30 void CallJavaWithBitmap( 38 void CallJavaWithBitmap(
31 std::unique_ptr<ScopedJavaGlobalRef<jobject>> j_callback, 39 std::unique_ptr<ScopedJavaGlobalRef<jobject>> j_callback,
32 bool is_local_thumbnail, 40 bool is_local_thumbnail,
33 const SkBitmap* bitmap) { 41 const SkBitmap* bitmap) {
34 JNIEnv* env = AttachCurrentThread(); 42 JNIEnv* env = AttachCurrentThread();
35 ScopedJavaLocalRef<jobject> j_bitmap; 43 ScopedJavaLocalRef<jobject> j_bitmap;
36 if (bitmap) 44 if (bitmap)
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 favicon_urls.emplace_back(site.favicon_url.spec()); 101 favicon_urls.emplace_back(site.favicon_url.spec());
94 large_icon_urls.emplace_back(site.large_icon_url.spec()); 102 large_icon_urls.emplace_back(site.large_icon_url.spec());
95 } 103 }
96 Java_MostVisitedURLsObserver_onPopularURLsAvailable( 104 Java_MostVisitedURLsObserver_onPopularURLsAvailable(
97 env, observer_.obj(), ToJavaArrayOfStrings(env, urls).obj(), 105 env, observer_.obj(), ToJavaArrayOfStrings(env, urls).obj(),
98 ToJavaArrayOfStrings(env, favicon_urls).obj(), 106 ToJavaArrayOfStrings(env, favicon_urls).obj(),
99 ToJavaArrayOfStrings(env, large_icon_urls).obj()); 107 ToJavaArrayOfStrings(env, large_icon_urls).obj());
100 } 108 }
101 109
102 MostVisitedSitesBridge::MostVisitedSitesBridge(Profile* profile) 110 MostVisitedSitesBridge::MostVisitedSitesBridge(Profile* profile)
103 : most_visited_(profile, 111 : most_visited_(profile->GetPrefs(),
104 g_browser_process->variations_service()) {} 112 TemplateURLServiceFactory::GetForProfile(profile),
113 g_browser_process->variations_service(),
114 profile->GetRequestContext(),
115 TopSitesFactory::GetForProfile(profile),
116 SuggestionsServiceFactory::GetForProfile(profile),
117 profile->IsChild(),
118 profile) {
119 // Register the thumbnails debugging page.
120 // TODO(sfiera): find thumbnails a home. They don't belong here.
121 content::URLDataSource::Add(profile, new ThumbnailListSource(profile));
122 }
105 123
106 MostVisitedSitesBridge::~MostVisitedSitesBridge() {} 124 MostVisitedSitesBridge::~MostVisitedSitesBridge() {}
107 125
108 void MostVisitedSitesBridge::Destroy( 126 void MostVisitedSitesBridge::Destroy(
109 JNIEnv* env, const JavaParamRef<jobject>& obj) { 127 JNIEnv* env, const JavaParamRef<jobject>& obj) {
110 delete this; 128 delete this;
111 } 129 }
112 130
113 void MostVisitedSitesBridge::SetMostVisitedURLsObserver( 131 void MostVisitedSitesBridge::SetMostVisitedURLsObserver(
114 JNIEnv* env, 132 JNIEnv* env,
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 } 181 }
164 182
165 static jlong Init(JNIEnv* env, 183 static jlong Init(JNIEnv* env,
166 const JavaParamRef<jobject>& obj, 184 const JavaParamRef<jobject>& obj,
167 const JavaParamRef<jobject>& jprofile) { 185 const JavaParamRef<jobject>& jprofile) {
168 MostVisitedSitesBridge* most_visited_sites = 186 MostVisitedSitesBridge* most_visited_sites =
169 new MostVisitedSitesBridge( 187 new MostVisitedSitesBridge(
170 ProfileAndroid::FromProfileAndroid(jprofile)); 188 ProfileAndroid::FromProfileAndroid(jprofile));
171 return reinterpret_cast<intptr_t>(most_visited_sites); 189 return reinterpret_cast<intptr_t>(most_visited_sites);
172 } 190 }
OLDNEW
« no previous file with comments | « chrome/browser/android/ntp/most_visited_sites.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698