summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm4
-rw-r--r--chrome/common/child_process_logging_mac.mm4
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
index abb528d..bc6dfc6 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -218,7 +218,7 @@ NSAttributedString* OmniboxPopupViewMac::MatchText(
font.GetNativeFont(), NSFontAttributeName,
ContentTextColor(), NSForegroundColorAttributeName,
nil];
- NSString* rawEnDash = [NSString stringWithFormat:@" %C ", 0x2013];
+ NSString* rawEnDash = @" \u2013 ";
NSAttributedString* enDash =
[[[NSAttributedString alloc] initWithString:rawEnDash
attributes:attributes] autorelease];
diff --git a/chrome/common/child_process_logging_mac.mm b/chrome/common/child_process_logging_mac.mm
index d539e46..2f5222e 100644
--- a/chrome/common/child_process_logging_mac.mm
+++ b/chrome/common/child_process_logging_mac.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -187,7 +187,7 @@ void SetCommandLine(const CommandLine* command_line) {
// Note the total number of switches, not including the exec path.
const CommandLine::StringVector& argv = command_line->argv();
SetCrashKeyValue(kNumSwitchesKey,
- [NSString stringWithFormat:@"%d", argv.size() - 1]);
+ [NSString stringWithFormat:@"%zu", argv.size() - 1]);
size_t key_i = 0;
for (size_t i = 1; i < argv.size() && key_i < kMaxSwitches; ++i) {