chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

Side by Side Diff: chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: nit Created 6 years, 4 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

« chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc ('K') | « chrome/browser/ui/cocoa/simple_message_box_mac.mm ('k') | chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm » ('j') | chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 #import "chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h"	5 #import "chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h"

6	6

7 #import <SecurityInterface/SFChooseIdentityPanel.h>	7 #import <SecurityInterface/SFChooseIdentityPanel.h>

8	8

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "base/mac/foundation_util.h"	10 #include "base/mac/foundation_util.h"

11 #include "base/strings/string_util.h"	11 #include "base/strings/string_util.h"

12 #include "base/strings/sys_string_conversions.h"	12 #include "base/strings/sys_string_conversions.h"

13 #include "base/strings/utf_string_conversions.h"	13 #include "base/strings/utf_string_conversions.h"

14 #include "chrome/browser/ssl/ssl_client_auth_observer.h"	14 #include "chrome/browser/ssl/ssl_client_auth_observer.h"

15 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"	15 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"

	16 #include "chrome/grit/generated_resources.h"

16 #include "content/public/browser/browser_thread.h"	17 #include "content/public/browser/browser_thread.h"

17 #include "content/public/browser/web_contents.h"	18 #include "content/public/browser/web_contents.h"

18 #include "grit/generated_resources.h"

19 #include "net/cert/x509_certificate.h"	19 #include "net/cert/x509_certificate.h"

20 #include "net/cert/x509_util_mac.h"	20 #include "net/cert/x509_util_mac.h"

21 #include "net/ssl/ssl_cert_request_info.h"	21 #include "net/ssl/ssl_cert_request_info.h"

22 #include "ui/base/cocoa/window_size_constants.h"	22 #include "ui/base/cocoa/window_size_constants.h"

23 #include "ui/base/l10n/l10n_util_mac.h"	23 #include "ui/base/l10n/l10n_util_mac.h"

24	24

25 using content::BrowserThread;	25 using content::BrowserThread;

26	26

27 @interface SFChooseIdentityPanel (SystemPrivate)	27 @interface SFChooseIdentityPanel (SystemPrivate)

28 // A system-private interface that dismisses a panel whose sheet was started by	28 // A system-private interface that dismisses a panel whose sheet was started by

(...skipping 201 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
230 }	230 }

231	231

232 - (void)onConstrainedWindowClosed {	232 - (void)onConstrainedWindowClosed {

233 observer_->StopObserving();	233 observer_->StopObserving();

234 panel_.reset();	234 panel_.reset();

235 constrainedWindow_.reset();	235 constrainedWindow_.reset();

236 [self release];	236 [self release];

237 }	237 }

238	238

239 @end	239 @end

OLD	NEW