diff options
Diffstat (limited to 'chrome/browser/ui/views')
5 files changed, 22 insertions, 20 deletions
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc index f372315..e242729 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc @@ -7,11 +7,11 @@ #include "apps/ui/views/app_window_frame_view.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/app_mode/app_mode_utils.h" -#include "chrome/browser/favicon/favicon_tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/views/apps/desktop_keyboard_capture.h" #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h" #include "chrome/browser/ui/views/frame/taskbar_decorator.h" +#include "components/favicon/content/content_favicon_driver.h" #include "components/ui/zoom/page_zoom.h" #include "components/ui/zoom/zoom_controller.h" #include "ui/views/controls/webview/webview.h" @@ -263,9 +263,9 @@ gfx::ImageSkia ChromeNativeAppWindowViews::GetWindowAppIcon() { gfx::ImageSkia ChromeNativeAppWindowViews::GetWindowIcon() { content::WebContents* web_contents = app_window()->web_contents(); if (web_contents) { - FaviconTabHelper* favicon_tab_helper = - FaviconTabHelper::FromWebContents(web_contents); - gfx::Image app_icon = favicon_tab_helper->GetFavicon(); + favicon::FaviconDriver* favicon_driver = + favicon::ContentFaviconDriver::FromWebContents(web_contents); + gfx::Image app_icon = favicon_driver->GetFavicon(); if (!app_icon.IsEmpty()) return *app_icon.ToImageSkia(); } diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index 6645a24..d91aa29 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc @@ -7,7 +7,6 @@ #include "base/i18n/rtl.h" #include "base/memory/scoped_vector.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/favicon/favicon_tab_helper.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h" @@ -17,6 +16,7 @@ #include "chrome/common/logging_chrome.h" #include "chrome/grit/generated_resources.h" #include "components/constrained_window/constrained_window_views.h" +#include "components/favicon/content/content_favicon_driver.h" #include "components/web_modal/web_contents_modal_dialog_host.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" @@ -111,8 +111,10 @@ base::string16 HungPagesTableModel::GetText(int row, int column_id) { gfx::ImageSkia HungPagesTableModel::GetIcon(int row) { DCHECK(row >= 0 && row < RowCount()); - return FaviconTabHelper::FromWebContents( - tab_observers_[row]->web_contents())->GetFavicon().AsImageSkia(); + return favicon::ContentFaviconDriver::FromWebContents( + tab_observers_[row]->web_contents()) + ->GetFavicon() + .AsImageSkia(); } void HungPagesTableModel::SetObserver(ui::TableModelObserver* observer) { diff --git a/chrome/browser/ui/views/hung_renderer_view.h b/chrome/browser/ui/views/hung_renderer_view.h index 162f669..d178aaf 100644 --- a/chrome/browser/ui/views/hung_renderer_view.h +++ b/chrome/browser/ui/views/hung_renderer_view.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_HUNG_RENDERER_VIEW_H_ #include "base/memory/scoped_vector.h" -#include "chrome/browser/favicon/favicon_tab_helper.h" +#include "components/favicon/content/content_favicon_driver.h" #include "content/public/browser/web_contents_observer.h" #include "ui/base/models/table_model.h" #include "ui/views/controls/button/button.h" @@ -64,8 +64,8 @@ class HungPagesTableModel : public ui::TableModel, public views::TableGrouper { WebContentsObserverImpl(HungPagesTableModel* model, content::WebContents* tab); - FaviconTabHelper* favicon_tab_helper() { - return FaviconTabHelper::FromWebContents(web_contents()); + favicon::FaviconDriver* favicon_driver() { + return favicon::ContentFaviconDriver::FromWebContents(web_contents()); } // WebContentsObserver overrides: diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 52f7afb..9a8e18a 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -20,7 +20,6 @@ #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/location_bar_controller.h" #include "chrome/browser/extensions/tab_helper.h" -#include "chrome/browser/favicon/favicon_tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/instant_service.h" #include "chrome/browser/search/instant_service_factory.h" @@ -58,6 +57,7 @@ #include "chrome/browser/ui/views/translate/translate_bubble_view.h" #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" +#include "components/favicon/content/content_favicon_driver.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" #include "components/translate/core/browser/language_state.h" @@ -1275,9 +1275,9 @@ void LocationBarView::WriteDragDataForView(views::View* sender, ui::DragDropTypes::DRAG_NONE); WebContents* web_contents = GetWebContents(); - FaviconTabHelper* favicon_tab_helper = - FaviconTabHelper::FromWebContents(web_contents); - gfx::ImageSkia favicon = favicon_tab_helper->GetFavicon().AsImageSkia(); + favicon::FaviconDriver* favicon_driver = + favicon::ContentFaviconDriver::FromWebContents(web_contents); + gfx::ImageSkia favicon = favicon_driver->GetFavicon().AsImageSkia(); button_drag_utils::SetURLAndDragImage(web_contents->GetURL(), web_contents->GetTitle(), favicon, diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index 23a17e9..61797eb 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -13,7 +13,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/tab_helper.h" -#include "chrome/browser/favicon/favicon_tab_helper.h" +#include "chrome/browser/favicon/favicon_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/search.h" #include "chrome/browser/ui/browser.h" @@ -28,6 +28,7 @@ #include "chrome/browser/ui/views/tabs/tab_strip.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/favicon/content/content_favicon_driver.h" #include "components/metrics/proto/omnibox_event.pb.h" #include "components/omnibox/autocomplete_match.h" #include "content/public/browser/browser_thread.h" @@ -498,10 +499,10 @@ void BrowserTabStripController::SetTabRendererDataFromModel( int model_index, TabRendererData* data, TabStatus tab_status) { - FaviconTabHelper* favicon_tab_helper = - FaviconTabHelper::FromWebContents(contents); + favicon::FaviconDriver* favicon_driver = + favicon::ContentFaviconDriver::FromWebContents(contents); - data->favicon = favicon_tab_helper->GetFavicon().AsImageSkia(); + data->favicon = favicon_driver->GetFavicon().AsImageSkia(); data->network_state = TabContentsNetworkState(contents); data->title = contents->GetTitle(); data->url = contents->GetURL(); @@ -509,8 +510,7 @@ void BrowserTabStripController::SetTabRendererDataFromModel( data->crashed_status = contents->GetCrashedStatus(); data->incognito = contents->GetBrowserContext()->IsOffTheRecord(); data->mini = model_->IsMiniTab(model_index); - data->show_icon = - data->mini || FaviconTabHelper::ShouldDisplayFavicon(contents); + data->show_icon = data->mini || favicon::ShouldDisplayFavicon(contents); data->blocked = model_->IsTabBlocked(model_index); data->app = extensions::TabHelper::FromWebContents(contents)->is_app(); data->media_state = chrome::GetTabMediaStateForContents(contents); |