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

Unified Diff: chrome/browser/ssl/ssl_add_cert_handler_mac.mm

Issue 302653006: Remove use of ResourceRequestInfo::GetRequestID from cert enrollment. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase again. Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ssl/ssl_add_cert_handler.cc ('k') | chrome/browser/ssl/ssl_add_certificate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ssl/ssl_add_cert_handler_mac.mm
diff --git a/chrome/browser/ssl/ssl_add_cert_handler_mac.mm b/chrome/browser/ssl/ssl_add_cert_handler_mac.mm
deleted file mode 100644
index a2906f90465f4e5cad53394fbe0971e5c5274c90..0000000000000000000000000000000000000000
--- a/chrome/browser/ssl/ssl_add_cert_handler_mac.mm
+++ /dev/null
@@ -1,88 +0,0 @@
-// 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.
-
-#include "ssl_add_cert_handler.h"
-
-#include <SecurityInterface/SFCertificatePanel.h>
-#include <SecurityInterface/SFCertificateView.h>
-
-#include "base/logging.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
-#include "chrome/common/logging_chrome.h"
-#include "grit/generated_resources.h"
-#include "net/cert/x509_certificate.h"
-#include "ui/base/l10n/l10n_util_mac.h"
-
-@interface SSLAddCertHandlerCocoa : NSObject
-{
- scoped_refptr<SSLAddCertHandler> handler_;
-}
-
-- (id)initWithHandler:(SSLAddCertHandler*)handler;
-- (void)askToAddCert;
-@end
-
-
-void SSLAddCertHandler::AskToAddCert() {
- [[[SSLAddCertHandlerCocoa alloc] initWithHandler: this] askToAddCert];
- // The new object will release itself when the sheet ends.
-}
-
-
-// The actual implementation of the add-client-cert handler is an Obj-C class.
-@implementation SSLAddCertHandlerCocoa
-
-- (id)initWithHandler:(SSLAddCertHandler*)handler {
- DCHECK(handler && handler->cert());
- self = [super init];
- if (self) {
- handler_ = handler;
- }
- return self;
-}
-
-- (void)sheetDidEnd:(SFCertificatePanel*)panel
- returnCode:(NSInteger)returnCode
- context:(void*)context {
- [panel orderOut:self];
- [panel autorelease];
- handler_->Finished(returnCode == NSOKButton);
- [self release];
-}
-
-- (void)askToAddCert {
- NSWindow* parentWindow = NULL;
- Browser* browser = chrome::GetLastActiveBrowser();
- // TODO(snej): Can I get the Browser that issued the request?
- if (browser) {
- parentWindow = browser->window()->GetNativeWindow();
- if ([parentWindow attachedSheet])
- parentWindow = nil;
- }
-
- // Create the cert panel, which will be released in my -sheetDidEnd: method.
- SFCertificatePanel* panel = [[SFCertificatePanel alloc] init];
- [panel setDefaultButtonTitle:l10n_util::GetNSString(IDS_ADD_CERT_DIALOG_ADD)];
- [panel setAlternateButtonTitle:l10n_util::GetNSString(IDS_CANCEL)];
- SecCertificateRef cert = handler_->cert()->os_cert_handle();
- NSArray* certs = [NSArray arrayWithObject: (id)cert];
-
- if (parentWindow) {
- // Open the cert panel as a sheet on the browser window.
- [panel beginSheetForWindow:parentWindow
- modalDelegate:self
- didEndSelector:@selector(sheetDidEnd:returnCode:context:)
- contextInfo:NULL
- certificates:certs
- showGroup:NO];
- } else {
- // No available browser window, so run independently as a (blocking) dialog.
- int returnCode = [panel runModalForCertificates:certs showGroup:NO];
- [self sheetDidEnd:panel returnCode:returnCode context:NULL];
- }
-}
-
-@end
« no previous file with comments | « chrome/browser/ssl/ssl_add_cert_handler.cc ('k') | chrome/browser/ssl/ssl_add_certificate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698