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

Side by Side Diff: chrome/browser/ui/webui/options2/certificate_manager_handler2.cc

Issue 10554010: Remove BrowserList::GetLastActive usage from WebUI pages. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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 "chrome/browser/ui/webui/options2/certificate_manager_handler2.h" 5 #include "chrome/browser/ui/webui/options2/certificate_manager_handler2.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/file_util.h" // for FileAccessProvider 9 #include "base/file_util.h" // for FileAccessProvider
10 #include "base/memory/scoped_vector.h" 10 #include "base/memory/scoped_vector.h"
11 #include "base/safe_strerror_posix.h" 11 #include "base/safe_strerror_posix.h"
12 #include "base/string_number_conversions.h" 12 #include "base/string_number_conversions.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/certificate_viewer.h" 15 #include "chrome/browser/certificate_viewer.h"
16 #include "chrome/browser/ui/certificate_dialogs.h" 16 #include "chrome/browser/ui/certificate_dialogs.h"
17 #include "chrome/browser/ui/crypto_module_password_dialog.h" 17 #include "chrome/browser/ui/crypto_module_password_dialog.h"
18 #include "chrome/browser/ui/tab_contents/tab_contents.h"
18 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
19 #include "content/public/browser/web_contents.h" 20 #include "content/public/browser/web_contents.h"
20 #include "content/public/browser/web_contents_view.h" 21 #include "content/public/browser/web_contents_view.h"
21 #include "grit/generated_resources.h" 22 #include "grit/generated_resources.h"
22 #include "net/base/crypto_module.h" 23 #include "net/base/crypto_module.h"
23 #include "net/base/net_errors.h" 24 #include "net/base/net_errors.h"
24 #include "net/base/x509_certificate.h" 25 #include "net/base/x509_certificate.h"
25 #include "ui/base/l10n/l10n_util.h" 26 #include "ui/base/l10n/l10n_util.h"
26 #include "ui/base/l10n/l10n_util_collator.h" 27 #include "ui/base/l10n/l10n_util_collator.h"
27 28
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 break; 487 break;
487 default: 488 default:
488 NOTREACHED(); 489 NOTREACHED();
489 } 490 }
490 } 491 }
491 492
492 void CertificateManagerHandler::View(const ListValue* args) { 493 void CertificateManagerHandler::View(const ListValue* args) {
493 net::X509Certificate* cert = CallbackArgsToCert(args); 494 net::X509Certificate* cert = CallbackArgsToCert(args);
494 if (!cert) 495 if (!cert)
495 return; 496 return;
496 ShowCertificateViewer(GetParentWindow(), cert); 497 ShowCertificateViewer(
498 TabContents::FromWebContents(web_ui()->GetWebContents()),
499 GetParentWindow(), cert);
497 } 500 }
498 501
499 void CertificateManagerHandler::GetCATrust(const ListValue* args) { 502 void CertificateManagerHandler::GetCATrust(const ListValue* args) {
500 net::X509Certificate* cert = CallbackArgsToCert(args); 503 net::X509Certificate* cert = CallbackArgsToCert(args);
501 if (!cert) { 504 if (!cert) {
502 web_ui()->CallJavascriptFunction("CertificateEditCaTrustOverlay.dismiss"); 505 web_ui()->CallJavascriptFunction("CertificateEditCaTrustOverlay.dismiss");
503 return; 506 return;
504 } 507 }
505 508
506 net::CertDatabase::TrustBits trust_bits = 509 net::CertDatabase::TrustBits trust_bits =
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 web_ui()->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady", 1064 web_ui()->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady",
1062 ready); 1065 ready);
1063 } 1066 }
1064 #endif 1067 #endif
1065 1068
1066 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const { 1069 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
1067 return web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow(); 1070 return web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow();
1068 } 1071 }
1069 1072
1070 } // namespace options2 1073 } // namespace options2
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698