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

Side by Side Diff: chrome/browser/ssl/ssl_add_cert_handler_mac.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 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 | Annotate | Revision Log
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 "ssl_add_cert_handler.h" 5 #include "ssl_add_cert_handler.h"
6 6
7 #include <SecurityInterface/SFCertificatePanel.h> 7 #include <SecurityInterface/SFCertificatePanel.h>
8 #include <SecurityInterface/SFCertificateView.h> 8 #include <SecurityInterface/SFCertificateView.h>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/scoped_nsobject.h" 11 #include "base/mac/scoped_nsobject.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/browser_window.h" 13 #include "chrome/browser/ui/browser_window.h"
14 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h" 14 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
15 #include "chrome/common/logging_chrome.h" 15 #include "chrome/common/logging_chrome.h"
16 #include "grit/generated_resources.h" 16 #include "grit/generated_resources.h"
17 #include "net/cert/x509_certificate.h" 17 #include "net/cert/x509_certificate.h"
18 #include "ui/base/l10n/l10n_util_mac.h" 18 #include "ui/base/l10n/l10n_util_mac.h"
19 19
20 @interface SSLAddCertHandlerCocoa : NSObject 20 @interface SSLAddCertHandlerCocoa : NSObject
21 { 21 {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 certificates:certs 80 certificates:certs
81 showGroup:NO]; 81 showGroup:NO];
82 } else { 82 } else {
83 // No available browser window, so run independently as a (blocking) dialog. 83 // No available browser window, so run independently as a (blocking) dialog.
84 int returnCode = [panel runModalForCertificates:certs showGroup:NO]; 84 int returnCode = [panel runModalForCertificates:certs showGroup:NO];
85 [self sheetDidEnd:panel returnCode:returnCode context:NULL]; 85 [self sheetDidEnd:panel returnCode:returnCode context:NULL];
86 } 86 }
87 } 87 }
88 88
89 @end 89 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698