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 #include "chrome/browser/ui/webui/certificate_viewer_webui.h" | 5 #include "chrome/browser/ui/webui/certificate_viewer_webui.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/i18n/time_formatting.h" | 9 #include "base/i18n/time_formatting.h" |
10 #include "base/json/json_writer.h" | 10 #include "base/json/json_writer.h" |
11 #include "base/strings/string_number_conversions.h" | 11 #include "base/strings/string_number_conversions.h" |
12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
13 #include "chrome/browser/certificate_viewer.h" | 13 #include "chrome/browser/certificate_viewer.h" |
14 #include "chrome/browser/platform_util.h" | 14 #include "chrome/browser/platform_util.h" |
15 #include "chrome/browser/ui/browser_dialogs.h" | 15 #include "chrome/browser/ui/browser_dialogs.h" |
16 #include "chrome/browser/ui/certificate_dialogs.h" | 16 #include "chrome/browser/ui/certificate_dialogs.h" |
17 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" | 17 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" |
18 #include "chrome/common/net/x509_certificate_model.h" | 18 #include "chrome/common/net/x509_certificate_model.h" |
19 #include "chrome/common/url_constants.h" | 19 #include "chrome/common/url_constants.h" |
20 #include "content/public/browser/web_contents.h" | 20 #include "content/public/browser/web_contents.h" |
21 #include "grit/generated_resources.h" | 21 #include "grit/generated_resources.h" |
22 #include "ui/base/l10n/l10n_util.h" | 22 #include "ui/base/l10n/l10n_util.h" |
23 #include "ui/gfx/size.h" | 23 #include "ui/gfx/size.h" |
24 #include "ui/web_dialogs/web_dialog_observer.h" | 24 #include "ui/web_dialogs/web_dialog_observer.h" |
25 | 25 |
26 using content::WebContents; | 26 using content::WebContents; |
27 using content::WebUIMessageHandler; | 27 using content::WebUIMessageHandler; |
28 using ui::WebDialogObserver; | 28 using ui::WebDialogObserver; |
| 29 using web_modal::NativeWebContentsModalDialog; |
29 | 30 |
30 namespace { | 31 namespace { |
31 | 32 |
32 // Default width/height of the dialog. | 33 // Default width/height of the dialog. |
33 const int kDefaultWidth = 580; | 34 const int kDefaultWidth = 580; |
34 const int kDefaultHeight = 600; | 35 const int kDefaultHeight = 600; |
35 | 36 |
36 } // namespace | 37 } // namespace |
37 | 38 |
38 // Shows a certificate using the WebUI certificate viewer. | 39 // Shows a certificate using the WebUI certificate viewer. |
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
404 const base::ListValue* args) const { | 405 const base::ListValue* args) const { |
405 int cert_index; | 406 int cert_index; |
406 double val; | 407 double val; |
407 if (!(args->GetDouble(0, &val))) | 408 if (!(args->GetDouble(0, &val))) |
408 return -1; | 409 return -1; |
409 cert_index = static_cast<int>(val); | 410 cert_index = static_cast<int>(val); |
410 if (cert_index < 0 || cert_index >= static_cast<int>(cert_chain_.size())) | 411 if (cert_index < 0 || cert_index >= static_cast<int>(cert_chain_.size())) |
411 return -1; | 412 return -1; |
412 return cert_index; | 413 return cert_index; |
413 } | 414 } |
OLD | NEW |