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

Unified Diff: chrome/browser/ui/hung_plugin_tab_helper.cc

Issue 2711623003: Update infobars to use VectorIcon struct instead of VectorIconId. (Closed)
Patch Set: rebase Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/hung_plugin_tab_helper.cc
diff --git a/chrome/browser/ui/hung_plugin_tab_helper.cc b/chrome/browser/ui/hung_plugin_tab_helper.cc
index 9e8d008a1af17ede3a0c5ad88083d9ffb9f9d630..24eb6ed174ced8e9f9161bfa142f24be6e882f4e 100644
--- a/chrome/browser/ui/hung_plugin_tab_helper.cc
+++ b/chrome/browser/ui/hung_plugin_tab_helper.cc
@@ -12,6 +12,7 @@
#include "base/process/process.h"
#include "base/rand_util.h"
#include "build/build_config.h"
+#include "chrome/app/vector_icons/vector_icons.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/infobars/infobar_service.h"
#include "chrome/common/channel_info.h"
@@ -31,7 +32,6 @@
#include "content/public/common/process_type.h"
#include "content/public/common/result_codes.h"
#include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/vector_icons_public.h"
#if defined(OS_WIN)
#include "base/win/scoped_handle.h"
@@ -151,7 +151,7 @@ class HungPluginInfoBarDelegate : public ConfirmInfoBarDelegate {
// ConfirmInfoBarDelegate:
infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
- gfx::VectorIconId GetVectorIconId() const override;
+ const gfx::VectorIcon& GetVectorIcon() const override;
base::string16 GetMessageText() const override;
int GetButtons() const override;
base::string16 GetButtonLabel(InfoBarButton button) const override;
@@ -196,8 +196,8 @@ HungPluginInfoBarDelegate::GetIdentifier() const {
return HUNG_PLUGIN_INFOBAR_DELEGATE;
}
-gfx::VectorIconId HungPluginInfoBarDelegate::GetVectorIconId() const {
- return gfx::VectorIconId::EXTENSION_CRASHED;
+const gfx::VectorIcon& HungPluginInfoBarDelegate::GetVectorIcon() const {
+ return kExtensionCrashedIcon;
}
base::string16 HungPluginInfoBarDelegate::GetMessageText() const {
« no previous file with comments | « chrome/browser/ui/collected_cookies_infobar_delegate.cc ('k') | chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698