summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/cocoa/hung_renderer_controller.mm
diff options
context:
space:
mode:
authorsdefresne <sdefresne@chromium.org>2015-04-10 08:25:15 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-10 15:25:40 +0000
commit45582697f9846db420f07615886651e9688e70d3 (patch)
treee513186de8fcad58e36cb0f33dc462ec210a3ac3 /chrome/browser/ui/cocoa/hung_renderer_controller.mm
parent375ce9a7839b5610d09e6e18f9d0358bf3571a83 (diff)
downloadchromium_src-45582697f9846db420f07615886651e9688e70d3.zip
chromium_src-45582697f9846db420f07615886651e9688e70d3.tar.gz
chromium_src-45582697f9846db420f07615886651e9688e70d3.tar.bz2
Remove FaviconTabHelper
Convert CreateForWebContents() and ShouldDisplayFavicon() from static method into free functions and move them into the favicon namespace. Port client code to use favicon::ContentFaviconDriver::FromWebContents() to access the favicon::FaviconDriver and prefer to use the public base class instead of favicon::ContentFaviconDriver. Rename FaviconTabHelperTest to ContentFaviconDriverTest. BUG=359569 TBR=jochen Review URL: https://codereview.chromium.org/1075443003 Cr-Commit-Position: refs/heads/master@{#324639}
Diffstat (limited to 'chrome/browser/ui/cocoa/hung_renderer_controller.mm')
-rw-r--r--chrome/browser/ui/cocoa/hung_renderer_controller.mm1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.mm b/chrome/browser/ui/cocoa/hung_renderer_controller.mm
index a72eeca..a3c5b90 100644
--- a/chrome/browser/ui/cocoa/hung_renderer_controller.mm
+++ b/chrome/browser/ui/cocoa/hung_renderer_controller.mm
@@ -9,7 +9,6 @@
#include "base/mac/bundle_locations.h"
#include "base/process/process.h"
#include "base/strings/sys_string_conversions.h"
-#include "chrome/browser/favicon/favicon_tab_helper.h"
#import "chrome/browser/ui/cocoa/multi_key_equivalent_button.h"
#import "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h"
#include "chrome/browser/ui/tab_contents/core_tab_helper.h"