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

Unified Diff: chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm

Issue 2614333002: Revert of Create vector icon resource directory specific to Chrome. (Closed)
Patch Set: Created 3 years, 11 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/cocoa/toolbar/reload_button_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm b/chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm
index 942994f8720bc9b6e06a811910114ad4ce4f0ce0..925bc4002ae740e119450c275ed69c2a6498256e 100644
--- a/chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm
+++ b/chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm
@@ -8,7 +8,6 @@
#include "base/macros.h"
#include "chrome/app/chrome_command_ids.h"
-#include "chrome/app/vector_icons/vector_icons.h"
#include "chrome/browser/command_updater.h"
#import "chrome/browser/ui/cocoa/accelerators_cocoa.h"
#import "chrome/browser/ui/cocoa/themed_window.h"
@@ -194,16 +193,16 @@
return VIEW_ID_RELOAD_BUTTON;
}
-- (const gfx::VectorIcon*)vectorIcon {
+- (gfx::VectorIconId)vectorIconId {
if ([self tag] == IDC_RELOAD) {
- return &kNavigateReloadIcon;
+ return gfx::VectorIconId::NAVIGATE_RELOAD;
} else if ([self tag] == IDC_STOP) {
- return &kNavigateStopIcon;
+ return gfx::VectorIconId::NAVIGATE_STOP;
} else {
NOTREACHED();
}
- return nullptr;
+ return gfx::VectorIconId::VECTOR_ICON_NONE;
}
- (void)mouseInsideStateDidChange:(BOOL)isInside {
« no previous file with comments | « chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698