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

Side by Side Diff: chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/tab_contents/sad_tab_view_cocoa.h" 5 #include "chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.h"
6 6
7 #include <stddef.h>
8
7 #include "base/logging.h" 9 #include "base/logging.h"
8 #include "base/strings/sys_string_conversions.h" 10 #include "base/strings/sys_string_conversions.h"
9 #include "chrome/common/url_constants.h" 11 #include "chrome/common/url_constants.h"
10 #include "chrome/grit/generated_resources.h" 12 #include "chrome/grit/generated_resources.h"
11 #include "grit/theme_resources.h" 13 #include "grit/theme_resources.h"
12 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw eaker.h" 14 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw eaker.h"
13 #import "ui/base/cocoa/controls/blue_label_button.h" 15 #import "ui/base/cocoa/controls/blue_label_button.h"
14 #import "ui/base/cocoa/controls/hyperlink_text_view.h" 16 #import "ui/base/cocoa/controls/hyperlink_text_view.h"
15 #import "ui/base/cocoa/nscolor_additions.h" 17 #import "ui/base/cocoa/nscolor_additions.h"
16 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 floor((NSWidth(bounds) - frameSize.width) / 2), 241 floor((NSWidth(bounds) - frameSize.width) / 2),
240 std::min(kMaxTopMargin, std::max(kTabMargin, 242 std::min(kMaxTopMargin, std::max(kTabMargin,
241 NSHeight(bounds) - [container_ contentHeight] - kTabMargin)))]; 243 NSHeight(bounds) - [container_ contentHeight] - kTabMargin)))];
242 } 244 }
243 245
244 - (NSButton*)reloadButton { 246 - (NSButton*)reloadButton {
245 return [container_ reloadButton]; 247 return [container_ reloadButton];
246 } 248 }
247 249
248 @end 250 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698