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

Side by Side Diff: chrome/browser/ui/webui/certificate_viewer_webui.cc

Issue 11633052: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use gtk_widget_get_toplevel for GetNativeWindow Created 7 years, 11 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/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/string_number_conversions.h" 11 #include "base/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/ui/browser_dialogs.h" 14 #include "chrome/browser/ui/browser_dialogs.h"
15 #include "chrome/browser/ui/certificate_dialogs.h" 15 #include "chrome/browser/ui/certificate_dialogs.h"
16 #include "chrome/browser/ui/constrained_window.h" 16 #include "chrome/browser/ui/web_contents_modal_dialog.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;
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 const base::ListValue* args) const { 403 const base::ListValue* args) const {
404 int cert_index; 404 int cert_index;
405 double val; 405 double val;
406 if (!(args->GetDouble(0, &val))) 406 if (!(args->GetDouble(0, &val)))
407 return -1; 407 return -1;
408 cert_index = static_cast<int>(val); 408 cert_index = static_cast<int>(val);
409 if (cert_index < 0 || cert_index >= static_cast<int>(cert_chain_.size())) 409 if (cert_index < 0 || cert_index >= static_cast<int>(cert_chain_.size()))
410 return -1; 410 return -1;
411 return cert_index; 411 return cert_index;
412 } 412 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698