diff options
Diffstat (limited to 'chrome/browser/ui/webui/conflicts_ui.cc')
| -rw-r--r-- | chrome/browser/ui/webui/conflicts_ui.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/conflicts_ui.cc b/chrome/browser/ui/webui/conflicts_ui.cc index d5e8ed9..75c1816 100644 --- a/chrome/browser/ui/webui/conflicts_ui.cc +++ b/chrome/browser/ui/webui/conflicts_ui.cc @@ -33,7 +33,6 @@ #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" using content::UserMetricsAction; @@ -175,7 +174,7 @@ ConflictsUI::ConflictsUI(content::WebUI* web_ui) : WebUIController(web_ui) { base::RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() { return static_cast<base::RefCountedMemory*>( ResourceBundle::GetSharedInstance().LoadDataResourceBytes( - IDR_CONFLICT_FAVICON, ui::SCALE_FACTOR_NONE)); + IDR_CONFLICT_FAVICON)); } #endif |