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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/bundle_util.mm

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 4 years, 12 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/cocoa/extensions/bundle_util.h" 5 #include "chrome/browser/ui/cocoa/extensions/bundle_util.h"
6 6
7 #include <stddef.h>
8
7 #include "base/mac/mac_util.h" 9 #include "base/mac/mac_util.h"
8 #include "base/mac/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
9 #include "base/strings/sys_string_conversions.h" 11 #include "base/strings/sys_string_conversions.h"
10 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw eaker.h" 12 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw eaker.h"
11 #include "ui/gfx/image/image_skia.h" 13 #include "ui/gfx/image/image_skia.h"
12 #include "ui/gfx/image/image_skia_util_mac.h" 14 #include "ui/gfx/image/image_skia_util_mac.h"
13 15
14 namespace { 16 namespace {
15 17
16 const CGFloat kExtensionIconSize = 32; 18 const CGFloat kExtensionIconSize = 32;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 [[NSImageView alloc] initWithFrame:icon_frame]); 57 [[NSImageView alloc] initWithFrame:icon_frame]);
56 [icon_view setImage:image]; 58 [icon_view setImage:image];
57 59
58 [items_field addSubview:icon_view]; 60 [items_field addSubview:icon_view];
59 [items_field addSubview:title_view]; 61 [items_field addSubview:title_view];
60 62
61 offset = NSMaxY(NSUnionRect(title_frame, icon_frame)); 63 offset = NSMaxY(NSUnionRect(title_frame, icon_frame));
62 } 64 }
63 return offset; 65 return offset;
64 } 66 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698