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

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

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 8 years, 8 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
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 "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
19 #include "content/public/browser/web_contents.h" 19 #include "content/public/browser/web_contents.h"
20 #include "content/public/browser/web_contents_view.h" 20 #include "content/public/browser/web_contents_view.h"
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/net_errors.h" 23 #include "net/base/net_errors.h"
24 #include "net/base/x509_certificate.h" 24 #include "net/base/x509_certificate.h"
25 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
26 #include "ui/base/l10n/l10n_util_collator.h" 26 #include "ui/base/l10n/l10n_util_collator.h"
27 27
28 #if defined(OS_CHROMEOS) 28 #if defined(OS_CHROMEOS)
29 #include "chrome/browser/chromeos/dbus/cryptohome_client.h" 29 #include "chromeos/dbus/cryptohome_client.h"
30 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" 30 #include "chromeos/dbus/dbus_thread_manager.h"
31 #endif 31 #endif
32 32
33 using content::BrowserThread; 33 using content::BrowserThread;
34 34
35 namespace { 35 namespace {
36 36
37 static const char kKeyId[] = "id"; 37 static const char kKeyId[] = "id";
38 static const char kSubNodesId[] = "subnodes"; 38 static const char kSubNodesId[] = "subnodes";
39 static const char kNameId[] = "name"; 39 static const char kNameId[] = "name";
40 static const char kReadOnlyId[] = "readonly"; 40 static const char kReadOnlyId[] = "readonly";
(...skipping 1016 matching lines...) Expand 10 before | Expand all | Expand 10 after
1057 web_ui()->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady", 1057 web_ui()->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady",
1058 ready); 1058 ready);
1059 } 1059 }
1060 #endif 1060 #endif
1061 1061
1062 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const { 1062 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
1063 return web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow(); 1063 return web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow();
1064 } 1064 }
1065 1065
1066 } // namespace options2 1066 } // namespace options2
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options2/certificate_manager_handler2.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698