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

Side by Side Diff: chrome/browser/ui/webui/options/certificate_manager_handler.cc

Issue 8543001: move chrome/browser/ui/gtk/certificate_viewer.* to chrome/browser/ui, add it to (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort and rebase Created 9 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/webui/certificate_viewer_webui.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/options/certificate_manager_handler.h" 5 #include "chrome/browser/ui/webui/options/certificate_manager_handler.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/crypto_module_password_dialog.h" 17 #include "chrome/browser/ui/crypto_module_password_dialog.h"
17 #include "chrome/browser/ui/gtk/certificate_dialogs.h"
18 #include "content/browser/tab_contents/tab_contents.h" 18 #include "content/browser/tab_contents/tab_contents.h"
19 #include "content/browser/tab_contents/tab_contents_view.h" 19 #include "content/browser/tab_contents/tab_contents_view.h"
20 #include "content/public/browser/browser_thread.h" // for FileAccessProvider 20 #include "content/public/browser/browser_thread.h" // for FileAccessProvider
21 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
22 #include "net/base/crypto_module.h" 22 #include "net/base/crypto_module.h"
23 #include "net/base/x509_certificate.h" 23 #include "net/base/x509_certificate.h"
24 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/base/l10n/l10n_util_collator.h" 25 #include "ui/base/l10n/l10n_util_collator.h"
26 26
27 #if defined(OS_CHROMEOS) 27 #if defined(OS_CHROMEOS)
(...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after
1037 // TODO(xiyuan): Use async way when underlying supports it. 1037 // TODO(xiyuan): Use async way when underlying supports it.
1038 base::FundamentalValue ready(cryptohome->Pkcs11IsTpmTokenReady()); 1038 base::FundamentalValue ready(cryptohome->Pkcs11IsTpmTokenReady());
1039 web_ui_->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady", 1039 web_ui_->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady",
1040 ready); 1040 ready);
1041 } 1041 }
1042 #endif 1042 #endif
1043 1043
1044 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const { 1044 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
1045 return web_ui_->tab_contents()->view()->GetTopLevelNativeWindow(); 1045 return web_ui_->tab_contents()->view()->GetTopLevelNativeWindow();
1046 } 1046 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/certificate_viewer_webui.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698