summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/android/navigation_popup.cc5
-rw-r--r--chrome/browser/ui/app_list/search/suggestions/suggestions_search_provider.h7
-rw-r--r--chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.cc5
-rw-r--r--chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.h9
-rw-r--r--chrome/browser/ui/cocoa/history_menu_bridge.mm2
-rw-r--r--chrome/browser/ui/search_engines/template_url_table_model.cc2
-rw-r--r--chrome/browser/ui/search_engines/template_url_table_model.h9
-rw-r--r--chrome/browser/ui/toolbar/back_forward_menu_model.cc5
-rw-r--r--chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc5
-rw-r--r--chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc2
-rw-r--r--chrome/browser/ui/webui/extensions/extension_icon_source.cc5
-rw-r--r--chrome/browser/ui/webui/favicon_source.cc5
-rw-r--r--chrome/browser/ui/webui/large_icon_source.cc2
-rw-r--r--chrome/browser/ui/webui/large_icon_source.h7
-rw-r--r--chrome/browser/ui/webui/ntp/app_launcher_handler.cc5
-rw-r--r--chrome/browser/ui/webui/ntp/favicon_webui_handler.cc5
-rw-r--r--chrome/browser/ui/webui/ntp/most_visited_handler.cc5
17 files changed, 53 insertions, 32 deletions
diff --git a/chrome/browser/ui/android/navigation_popup.cc b/chrome/browser/ui/android/navigation_popup.cc
index a48c421..53129a2 100644
--- a/chrome/browser/ui/android/navigation_popup.cc
+++ b/chrome/browser/ui/android/navigation_popup.cc
@@ -40,8 +40,9 @@ void NavigationPopup::FetchFaviconForUrl(JNIEnv* env,
jobject obj,
jstring jurl) {
Profile* profile = g_browser_process->profile_manager()->GetLastUsedProfile();
- FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
- profile, ServiceAccessType::EXPLICIT_ACCESS);
+ favicon::FaviconService* favicon_service =
+ FaviconServiceFactory::GetForProfile(profile,
+ ServiceAccessType::EXPLICIT_ACCESS);
if (!favicon_service)
return;
GURL url(base::android::ConvertJavaStringToUTF16(env, jurl));
diff --git a/chrome/browser/ui/app_list/search/suggestions/suggestions_search_provider.h b/chrome/browser/ui/app_list/search/suggestions/suggestions_search_provider.h
index ae68fba..bf06e4e 100644
--- a/chrome/browser/ui/app_list/search/suggestions/suggestions_search_provider.h
+++ b/chrome/browser/ui/app_list/search/suggestions/suggestions_search_provider.h
@@ -11,9 +11,12 @@
#include "ui/app_list/search_provider.h"
class AppListControllerDelegate;
-class FaviconService;
class Profile;
+namespace favicon {
+class FaviconService;
+} // namespace favicon
+
namespace suggestions {
class SuggestionsProfile;
class SuggestionsService;
@@ -38,7 +41,7 @@ class SuggestionsSearchProvider : public SearchProvider {
Profile* profile_;
AppListControllerDelegate* list_controller_;
- FaviconService* favicon_service_;
+ favicon::FaviconService* favicon_service_;
suggestions::SuggestionsService* suggestions_service_;
// For callbacks may be run after destruction.
diff --git a/chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.cc b/chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.cc
index 8586261..3b1904e 100644
--- a/chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.cc
+++ b/chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.cc
@@ -22,8 +22,9 @@
namespace app_list {
URLSuggestionResult::URLSuggestionResult(
- Profile* profile, AppListControllerDelegate* list_controller,
- FaviconService* favicon_service,
+ Profile* profile,
+ AppListControllerDelegate* list_controller,
+ favicon::FaviconService* favicon_service,
suggestions::SuggestionsService* suggestions_service,
const suggestions::ChromeSuggestion& suggestion)
: profile_(profile),
diff --git a/chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.h b/chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.h
index 5690edd..b4204e4 100644
--- a/chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.h
+++ b/chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.h
@@ -11,11 +11,14 @@
#include "ui/app_list/search_result.h"
class AppListControllerDelegate;
-class FaviconService;
class GURL;
class Profile;
class SkBitmap;
+namespace favicon {
+class FaviconService;
+} // namespace favicon
+
namespace favicon_base {
struct FaviconRawBitmapResult;
} // namespace favicon_base
@@ -32,7 +35,7 @@ class URLSuggestionResult : public SearchResult {
// is expected to live longer that |suggestion|.
URLSuggestionResult(Profile* profile,
AppListControllerDelegate* list_controller,
- FaviconService* favicon_service,
+ favicon::FaviconService* favicon_service,
suggestions::SuggestionsService* suggestions_service,
const suggestions::ChromeSuggestion& suggestion);
~URLSuggestionResult() override;
@@ -52,7 +55,7 @@ class URLSuggestionResult : public SearchResult {
Profile* profile_;
AppListControllerDelegate* list_controller_;
- FaviconService* favicon_service_;
+ favicon::FaviconService* favicon_service_;
suggestions::SuggestionsService* suggestions_service_;
suggestions::ChromeSuggestion suggestion_;
scoped_ptr<base::CancelableTaskTracker> cancelable_task_tracker_;
diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm
index 5d5ae9d..560d64b 100644
--- a/chrome/browser/ui/cocoa/history_menu_bridge.mm
+++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm
@@ -395,7 +395,7 @@ HistoryMenuBridge::HistoryItem* HistoryMenuBridge::HistoryItemForTab(
}
void HistoryMenuBridge::GetFaviconForHistoryItem(HistoryItem* item) {
- FaviconService* service = FaviconServiceFactory::GetForProfile(
+ favicon::FaviconService* service = FaviconServiceFactory::GetForProfile(
profile_, ServiceAccessType::EXPLICIT_ACCESS);
base::CancelableTaskTracker::TaskId task_id =
service->GetFaviconImageForPageURL(
diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc
index db5a01a..83492ea 100644
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -115,7 +115,7 @@ class TemplateURLTableModel::ModelEntry {
TemplateURLTableModel::TemplateURLTableModel(
TemplateURLService* template_url_service,
- FaviconService* favicon_service)
+ favicon::FaviconService* favicon_service)
: observer_(NULL),
template_url_service_(template_url_service),
favicon_service_(favicon_service) {
diff --git a/chrome/browser/ui/search_engines/template_url_table_model.h b/chrome/browser/ui/search_engines/template_url_table_model.h
index fd48475..03a2bde 100644
--- a/chrome/browser/ui/search_engines/template_url_table_model.h
+++ b/chrome/browser/ui/search_engines/template_url_table_model.h
@@ -14,10 +14,13 @@
#include "components/search_engines/template_url_service_observer.h"
#include "ui/base/models/table_model.h"
-class FaviconService;
class TemplateURL;
class TemplateURLService;
+namespace favicon {
+class FaviconService;
+}
+
namespace gfx {
class ImageSkia;
}
@@ -37,7 +40,7 @@ class TemplateURLTableModel : public ui::TableModel,
TemplateURLServiceObserver {
public:
TemplateURLTableModel(TemplateURLService* template_url_service,
- FaviconService* favicon_service);
+ favicon::FaviconService* favicon_service);
~TemplateURLTableModel() override;
@@ -122,7 +125,7 @@ class TemplateURLTableModel : public ui::TableModel,
// The model we're displaying entries from.
TemplateURLService* template_url_service_;
- FaviconService* favicon_service_;
+ favicon::FaviconService* favicon_service_;
// Index of the last search engine in entries_. This is used to determine the
// group boundaries.
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.cc b/chrome/browser/ui/toolbar/back_forward_menu_model.cc
index 762d28d..15d58e7 100644
--- a/chrome/browser/ui/toolbar/back_forward_menu_model.cc
+++ b/chrome/browser/ui/toolbar/back_forward_menu_model.cc
@@ -248,8 +248,9 @@ void BackForwardMenuModel::FetchFavicon(NavigationEntry* entry) {
return;
}
requested_favicons_.insert(entry->GetUniqueID());
- FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
- browser_->profile(), ServiceAccessType::EXPLICIT_ACCESS);
+ favicon::FaviconService* favicon_service =
+ FaviconServiceFactory::GetForProfile(browser_->profile(),
+ ServiceAccessType::EXPLICIT_ACCESS);
if (!favicon_service)
return;
diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
index c8e3d39..fa2b428 100644
--- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
+++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
@@ -611,8 +611,9 @@ void RecentTabsSubMenuModel::AddTabFavicon(int command_id, const GURL& url) {
// Set default icon first.
SetIcon(index_in_menu, default_favicon_);
// Start request to fetch actual icon if possible.
- FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
- browser_->profile(), ServiceAccessType::EXPLICIT_ACCESS);
+ favicon::FaviconService* favicon_service =
+ FaviconServiceFactory::GetForProfile(browser_->profile(),
+ ServiceAccessType::EXPLICIT_ACCESS);
if (!favicon_service)
return;
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 69ad96c..023af7a 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -559,7 +559,7 @@ void RunFaviconCallbackAsync(
const std::vector<favicon_base::FaviconRawBitmapResult>* results) {
base::MessageLoopProxy::current()->PostTask(
FROM_HERE,
- base::Bind(&FaviconService::FaviconResultsCallbackRunner,
+ base::Bind(&favicon::FaviconService::FaviconResultsCallbackRunner,
callback, base::Owned(results)));
}
diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
index aa7ee85..aa4fc2e 100644
--- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc
+++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
@@ -210,8 +210,9 @@ void ExtensionIconSource::LoadExtensionImage(const ExtensionResource& icon,
}
void ExtensionIconSource::LoadFaviconImage(int request_id) {
- FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
- profile_, ServiceAccessType::EXPLICIT_ACCESS);
+ favicon::FaviconService* favicon_service =
+ FaviconServiceFactory::GetForProfile(profile_,
+ ServiceAccessType::EXPLICIT_ACCESS);
// Fall back to the default icons if the service isn't available.
if (favicon_service == NULL) {
LoadDefaultImage(request_id);
diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc
index 1f15edf..7809e73 100644
--- a/chrome/browser/ui/webui/favicon_source.cc
+++ b/chrome/browser/ui/webui/favicon_source.cc
@@ -65,8 +65,9 @@ void FaviconSource::StartDataRequest(
int render_process_id,
int render_frame_id,
const content::URLDataSource::GotDataCallback& callback) {
- FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
- profile_, ServiceAccessType::EXPLICIT_ACCESS);
+ favicon::FaviconService* favicon_service =
+ FaviconServiceFactory::GetForProfile(profile_,
+ ServiceAccessType::EXPLICIT_ACCESS);
if (!favicon_service) {
SendDefaultResponse(callback);
return;
diff --git a/chrome/browser/ui/webui/large_icon_source.cc b/chrome/browser/ui/webui/large_icon_source.cc
index 1b12cdb..3fd2756 100644
--- a/chrome/browser/ui/webui/large_icon_source.cc
+++ b/chrome/browser/ui/webui/large_icon_source.cc
@@ -38,7 +38,7 @@ LargeIconSource::IconRequest::IconRequest(
LargeIconSource::IconRequest::~IconRequest() {
}
-LargeIconSource::LargeIconSource(FaviconService* favicon_service,
+LargeIconSource::LargeIconSource(favicon::FaviconService* favicon_service,
FallbackIconService* fallback_icon_service)
: favicon_service_(favicon_service),
fallback_icon_service_(fallback_icon_service) {
diff --git a/chrome/browser/ui/webui/large_icon_source.h b/chrome/browser/ui/webui/large_icon_source.h
index 7fcb825..bfe3e65 100644
--- a/chrome/browser/ui/webui/large_icon_source.h
+++ b/chrome/browser/ui/webui/large_icon_source.h
@@ -14,7 +14,10 @@
#include "content/public/browser/url_data_source.h"
class FallbackIconService;
+
+namespace favicon {
class FaviconService;
+}
// LargeIconSource services explicit chrome:// requests for large icons.
//
@@ -33,7 +36,7 @@ class LargeIconSource : public content::URLDataSource {
public:
// |favicon_service| and |fallback_icon_service| are owned by caller and may
// be null.
- LargeIconSource(FaviconService* favicon_service,
+ LargeIconSource(favicon::FaviconService* favicon_service,
FallbackIconService* fallback_icon_service);
~LargeIconSource() override;
@@ -77,7 +80,7 @@ class LargeIconSource : public content::URLDataSource {
base::CancelableTaskTracker cancelable_task_tracker_;
- FaviconService* favicon_service_;
+ favicon::FaviconService* favicon_service_;
FallbackIconService* fallback_icon_service_;
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
index e82057a..801ba18 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -713,8 +713,9 @@ void AppLauncherHandler::HandleGenerateAppForLink(const base::ListValue* args) {
app_sorting->PageIntegerAsStringOrdinal(static_cast<size_t>(page_index));
Profile* profile = Profile::FromWebUI(web_ui());
- FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
- profile, ServiceAccessType::EXPLICIT_ACCESS);
+ favicon::FaviconService* favicon_service =
+ FaviconServiceFactory::GetForProfile(profile,
+ ServiceAccessType::EXPLICIT_ACCESS);
if (!favicon_service) {
LOG(ERROR) << "No favicon service";
return;
diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
index 28e2eb1..8f1c392 100644
--- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
+++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
@@ -91,8 +91,9 @@ void FaviconWebUIHandler::HandleGetFaviconDominantColor(
std::string dom_id;
CHECK(args->GetString(1, &dom_id));
- FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
- Profile::FromWebUI(web_ui()), ServiceAccessType::EXPLICIT_ACCESS);
+ favicon::FaviconService* favicon_service =
+ FaviconServiceFactory::GetForProfile(Profile::FromWebUI(web_ui()),
+ ServiceAccessType::EXPLICIT_ACCESS);
if (!favicon_service || path.empty())
return;
diff --git a/chrome/browser/ui/webui/ntp/most_visited_handler.cc b/chrome/browser/ui/webui/ntp/most_visited_handler.cc
index e6a90c1..d81ebfb 100644
--- a/chrome/browser/ui/webui/ntp/most_visited_handler.cc
+++ b/chrome/browser/ui/webui/ntp/most_visited_handler.cc
@@ -86,8 +86,9 @@ void MostVisitedHandler::RegisterMessages() {
// Set up our sources for top-sites data.
content::URLDataSource::Add(profile, new ThumbnailListSource(profile));
- FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
- profile, ServiceAccessType::EXPLICIT_ACCESS);
+ favicon::FaviconService* favicon_service =
+ FaviconServiceFactory::GetForProfile(profile,
+ ServiceAccessType::EXPLICIT_ACCESS);
FallbackIconService* fallback_icon_service =
FallbackIconServiceFactory::GetForBrowserContext(profile);
generated by cgit v1.1 at 2025-05-13 18:01:53 +0000