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

Side by Side Diff: chrome/browser/cocoa/external_protocol_dialog.mm

Issue 2965015: Attempt four at landing the "histogram.h removed from message_loop.h" patch. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: win build fixes Created 10 years, 5 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #import "chrome/browser/cocoa/external_protocol_dialog.h" 5 #import "chrome/browser/cocoa/external_protocol_dialog.h"
6 6
7 #include "app/l10n_util_mac.h" 7 #include "app/l10n_util_mac.h"
8 #include "base/histogram.h"
8 #include "base/message_loop.h" 9 #include "base/message_loop.h"
9 #include "base/string_util.h" 10 #include "base/string_util.h"
10 #include "base/sys_string_conversions.h" 11 #include "base/sys_string_conversions.h"
11 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
12 #include "chrome/browser/external_protocol_handler.h" 13 #include "chrome/browser/external_protocol_handler.h"
13 #include "grit/chromium_strings.h" 14 #include "grit/chromium_strings.h"
14 #include "grit/generated_resources.h" 15 #include "grit/generated_resources.h"
15 16
16 /////////////////////////////////////////////////////////////////////////////// 17 ///////////////////////////////////////////////////////////////////////////////
17 // ExternalProtocolHandler 18 // ExternalProtocolHandler
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 } 145 }
145 NSString* appPath = [(NSURL*)openingApp path]; 146 NSString* appPath = [(NSURL*)openingApp path];
146 CFRelease(openingApp); // NOT A BUG; LSGetApplicationForURL retains for us 147 CFRelease(openingApp); // NOT A BUG; LSGetApplicationForURL retains for us
147 NSString* appDisplayName = 148 NSString* appDisplayName =
148 [[NSFileManager defaultManager] displayNameAtPath:appPath]; 149 [[NSFileManager defaultManager] displayNameAtPath:appPath];
149 150
150 return base::SysNSStringToUTF16(appDisplayName); 151 return base::SysNSStringToUTF16(appDisplayName);
151 } 152 }
152 153
153 @end 154 @end
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/download_item_controller.mm ('k') | chrome/browser/debugger/devtools_remote_listen_socket_unittest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698