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

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

Issue 10534098: TabContentsWrapper -> TabContents, part 51. (Closed) Base URL: svn://svn.chromium.org/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/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.h" 14 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/browser_dialogs.h" 15 #include "chrome/browser/ui/browser_dialogs.h"
16 #include "chrome/browser/ui/browser_list.h" 16 #include "chrome/browser/ui/browser_list.h"
17 #include "chrome/browser/ui/certificate_dialogs.h" 17 #include "chrome/browser/ui/certificate_dialogs.h"
18 #include "chrome/browser/ui/constrained_window.h" 18 #include "chrome/browser/ui/constrained_window.h"
19 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 19 #include "chrome/browser/ui/tab_contents/tab_contents.h"
20 #include "chrome/common/net/x509_certificate_model.h" 20 #include "chrome/common/net/x509_certificate_model.h"
21 #include "chrome/common/url_constants.h" 21 #include "chrome/common/url_constants.h"
22 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
23 #include "grit/generated_resources.h" 23 #include "grit/generated_resources.h"
24 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/web_dialogs/constrained_web_dialog_ui.h" 25 #include "ui/web_dialogs/constrained_web_dialog_ui.h"
26 #include "ui/web_dialogs/web_dialog_observer.h" 26 #include "ui/web_dialogs/web_dialog_observer.h"
27 27
28 using content::WebContents; 28 using content::WebContents;
29 using content::WebUIMessageHandler; 29 using content::WebUIMessageHandler;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 UTF8ToUTF16(x509_certificate_model::GetTitle(cert_chain.front()))); 65 UTF8ToUTF16(x509_certificate_model::GetTitle(cert_chain.front())));
66 } 66 }
67 67
68 CertificateViewerDialog::~CertificateViewerDialog() { 68 CertificateViewerDialog::~CertificateViewerDialog() {
69 } 69 }
70 70
71 void CertificateViewerDialog::Show(gfx::NativeWindow parent) { 71 void CertificateViewerDialog::Show(gfx::NativeWindow parent) {
72 // TODO(oshima): Should get browser from parent. 72 // TODO(oshima): Should get browser from parent.
73 Browser* browser = BrowserList::GetLastActive(); 73 Browser* browser = BrowserList::GetLastActive();
74 DCHECK(browser); 74 DCHECK(browser);
75 TabContentsWrapper* current_wrapper = 75 TabContents* current_tab_contents = browser->GetActiveTabContents();
76 browser->GetSelectedTabContentsWrapper();
77 // TODO(bshe): UI tweaks needed for AURA html Dialog, such as add padding on 76 // TODO(bshe): UI tweaks needed for AURA html Dialog, such as add padding on
78 // title for AURA ConstrainedWebDialogUI. 77 // title for AURA ConstrainedWebDialogUI.
79 window_ = ui::CreateConstrainedWebDialog( 78 window_ = ui::CreateConstrainedWebDialog(
80 current_wrapper->profile(), 79 current_tab_contents->profile(),
81 this, 80 this,
82 NULL, 81 NULL,
83 current_wrapper)->window()->GetNativeWindow(); 82 current_tab_contents)->window()->GetNativeWindow();
84 } 83 }
85 84
86 ui::ModalType CertificateViewerDialog::GetDialogModalType() const { 85 ui::ModalType CertificateViewerDialog::GetDialogModalType() const {
87 return ui::MODAL_TYPE_NONE; 86 return ui::MODAL_TYPE_NONE;
88 } 87 }
89 88
90 string16 CertificateViewerDialog::GetDialogTitle() const { 89 string16 CertificateViewerDialog::GetDialogTitle() const {
91 return title_; 90 return title_;
92 } 91 }
93 92
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 const base::ListValue* args) const { 411 const base::ListValue* args) const {
413 int cert_index; 412 int cert_index;
414 double val; 413 double val;
415 if (!(args->GetDouble(0, &val))) 414 if (!(args->GetDouble(0, &val)))
416 return -1; 415 return -1;
417 cert_index = static_cast<int>(val); 416 cert_index = static_cast<int>(val);
418 if (cert_index < 0 || cert_index >= static_cast<int>(cert_chain_.size())) 417 if (cert_index < 0 || cert_index >= static_cast<int>(cert_chain_.size()))
419 return -1; 418 return -1;
420 return cert_index; 419 return cert_index;
421 } 420 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/certificate_viewer_ui.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698