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

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

Issue 10554010: Remove BrowserList::GetLastActive usage from WebUI pages. (Closed) Base URL: svn://chrome-svn/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
« no previous file with comments | « chrome/browser/ui/browser_list.h ('k') | chrome/browser/ui/webui/feedback_ui.cc » ('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) 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_finder.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.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"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 x509_certificate_model::GetCertChainFromCert(cert_->os_cert_handle(), 62 x509_certificate_model::GetCertChainFromCert(cert_->os_cert_handle(),
63 &cert_chain); 63 &cert_chain);
64 title_ = l10n_util::GetStringFUTF16(IDS_CERT_INFO_DIALOG_TITLE, 64 title_ = l10n_util::GetStringFUTF16(IDS_CERT_INFO_DIALOG_TITLE,
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 Browser* browser =
73 Browser* browser = BrowserList::GetLastActive(); 73 browser::FindBrowserWithWebContents(web_ui()->GetWebContents());
Ben Goodger (Google) 2012/06/15 20:15:44 so, this method is pretty much just as bad as GLA.
74 DCHECK(browser);
75 TabContents* current_tab_contents = browser->GetActiveTabContents(); 74 TabContents* current_tab_contents = browser->GetActiveTabContents();
76 // TODO(bshe): UI tweaks needed for AURA html Dialog, such as add padding on 75 // TODO(bshe): UI tweaks needed for AURA html Dialog, such as add padding on
77 // title for AURA ConstrainedWebDialogUI. 76 // title for AURA ConstrainedWebDialogUI.
78 window_ = ui::CreateConstrainedWebDialog( 77 window_ = ui::CreateConstrainedWebDialog(
79 current_tab_contents->profile(), 78 current_tab_contents->profile(),
80 this, 79 this,
81 NULL, 80 NULL,
82 current_tab_contents)->window()->GetNativeWindow(); 81 current_tab_contents)->window()->GetNativeWindow();
83 } 82 }
84 83
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 const base::ListValue* args) const { 410 const base::ListValue* args) const {
412 int cert_index; 411 int cert_index;
413 double val; 412 double val;
414 if (!(args->GetDouble(0, &val))) 413 if (!(args->GetDouble(0, &val)))
415 return -1; 414 return -1;
416 cert_index = static_cast<int>(val); 415 cert_index = static_cast<int>(val);
417 if (cert_index < 0 || cert_index >= static_cast<int>(cert_chain_.size())) 416 if (cert_index < 0 || cert_index >= static_cast<int>(cert_chain_.size()))
418 return -1; 417 return -1;
419 return cert_index; 418 return cert_index;
420 } 419 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_list.h ('k') | chrome/browser/ui/webui/feedback_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698