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

Side by Side Diff: chrome/browser/android/provider/chrome_browser_provider.cc

Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rename methods and vars to make image_scale more clear Created 7 years, 3 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 "chrome/browser/android/provider/chrome_browser_provider.h" 5 #include "chrome/browser/android/provider/chrome_browser_provider.h"
6 6
7 #include <list> 7 #include <list>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
(...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 669
670 chrome::FaviconBitmapResult Run(const GURL& url) { 670 chrome::FaviconBitmapResult Run(const GURL& url) {
671 RunAsyncRequestOnUIThreadBlocking( 671 RunAsyncRequestOnUIThreadBlocking(
672 base::Bind(&FaviconService::GetRawFaviconForURL, 672 base::Bind(&FaviconService::GetRawFaviconForURL,
673 base::Unretained(service()), 673 base::Unretained(service()),
674 FaviconService::FaviconForURLParams( 674 FaviconService::FaviconForURLParams(
675 profile(), 675 profile(),
676 url, 676 url,
677 chrome::FAVICON | chrome::TOUCH_ICON, 677 chrome::FAVICON | chrome::TOUCH_ICON,
678 gfx::kFaviconSize), 678 gfx::kFaviconSize),
679 ui::GetMaxScaleFactor(), 679 ui::GetMaxSupportedScaleFactor(),
680 base::Bind( 680 base::Bind(
681 &BookmarkIconFetchTask::OnFaviconRetrieved, 681 &BookmarkIconFetchTask::OnFaviconRetrieved,
682 base::Unretained(this)), 682 base::Unretained(this)),
683 cancelable_tracker())); 683 cancelable_tracker()));
684 return result_; 684 return result_;
685 } 685 }
686 686
687 private: 687 private:
688 void OnFaviconRetrieved(const chrome::FaviconBitmapResult& bitmap_result) { 688 void OnFaviconRetrieved(const chrome::FaviconBitmapResult& bitmap_result) {
689 result_ = bitmap_result; 689 result_ = bitmap_result;
(...skipping 921 matching lines...) Expand 10 before | Expand all | Expand 10 after
1611 Java_ChromeBrowserProvider_onBookmarkChanged(env, obj.obj()); 1611 Java_ChromeBrowserProvider_onBookmarkChanged(env, obj.obj());
1612 } else if (type == 1612 } else if (type ==
1613 chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED) { 1613 chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED) {
1614 JNIEnv* env = AttachCurrentThread(); 1614 JNIEnv* env = AttachCurrentThread();
1615 ScopedJavaLocalRef<jobject> obj = weak_java_provider_.get(env); 1615 ScopedJavaLocalRef<jobject> obj = weak_java_provider_.get(env);
1616 if (obj.is_null()) 1616 if (obj.is_null())
1617 return; 1617 return;
1618 Java_ChromeBrowserProvider_onSearchTermChanged(env, obj.obj()); 1618 Java_ChromeBrowserProvider_onSearchTermChanged(env, obj.obj());
1619 } 1619 }
1620 } 1620 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698