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

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h

Issue 1543393002: Switch to standard integer types in chrome/browser/ui/cocoa/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/bookmarks/bookmark_bar_controller.h
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h
index ec447cdd1cd6bd7fdf96d235644e82ffda54fc2f..0fb924bc090dd0fcaf53c0a179b836a1bc5fd558 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_
#import <Cocoa/Cocoa.h>
+#include <stdint.h>
#include <map>
#import "base/mac/cocoa_protocols.h"
@@ -185,8 +186,8 @@ willAnimateFromState:(BookmarkBar::State)oldState
// to represent the bookmark node they refer to. This map provides
// a mapping from one to the other, so we can properly identify the
// node from the item. When adding items in, we start with seedId_.
- int32 seedId_;
- std::map<int32,int64> menuTagMap_;
+ int32_t seedId_;
+ std::map<int32_t, int64_t> menuTagMap_;
// Our bookmark buttons, ordered from L-->R.
base::scoped_nsobject<NSMutableArray> buttons_;
@@ -434,8 +435,8 @@ willAnimateFromState:(BookmarkBar::State)oldState
- (NSRect)frameForBookmarkButtonFromCell:(NSCell*)cell xOffset:(int*)xOffset;
- (void)checkForBookmarkButtonGrowth:(NSButton*)button;
- (void)frameDidChange;
-- (int64)nodeIdFromMenuTag:(int32)tag;
-- (int32)menuTagFromNodeId:(int64)menuid;
+- (int64_t)nodeIdFromMenuTag:(int32_t)tag;
+- (int32_t)menuTagFromNodeId:(int64_t)menuid;
- (void)updateTheme:(const ui::ThemeProvider*)themeProvider;
- (BookmarkButton*)buttonForDroppingOnAtPoint:(NSPoint)point;
- (BOOL)isEventAnExitEvent:(NSEvent*)event;
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698