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

Unified Diff: chrome/browser/ui/certificate_dialogs.cc

Issue 10698053: Breaks compile on Linux Aura (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/certificate_dialogs.h ('k') | chrome/browser/ui/chrome_select_file_policy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/certificate_dialogs.cc
===================================================================
--- chrome/browser/ui/certificate_dialogs.cc (revision 144942)
+++ chrome/browser/ui/certificate_dialogs.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -12,7 +12,6 @@
#include "base/file_util.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/ui/chrome_select_file_policy.h"
#include "chrome/common/net/x509_certificate_model.h"
#include "content/public/browser/browser_thread.h"
#include "grit/generated_resources.h"
@@ -80,8 +79,7 @@
Exporter::Exporter(WebContents* web_contents,
gfx::NativeWindow parent,
net::X509Certificate::OSCertHandle cert)
- : select_file_dialog_(SelectFileDialog::Create(
- this, new ChromeSelectFilePolicy(web_contents))) {
+ : select_file_dialog_(SelectFileDialog::Create(this)) {
x509_certificate_model::GetCertChainFromCert(cert, &cert_chain_list_);
// TODO(mattm): should this default to some directory?
@@ -94,6 +92,7 @@
ShowCertSelectFileDialog(select_file_dialog_.get(),
SelectFileDialog::SELECT_SAVEAS_FILE,
suggested_path,
+ web_contents,
parent,
NULL);
}
@@ -145,6 +144,7 @@
void ShowCertSelectFileDialog(SelectFileDialog* select_file_dialog,
SelectFileDialog::Type type,
const FilePath& suggested_path,
+ WebContents* web_contents,
gfx::NativeWindow parent,
void* params) {
SelectFileDialog::FileTypeInfo file_type_info;
@@ -170,7 +170,7 @@
select_file_dialog->SelectFile(
type, string16(),
suggested_path, &file_type_info, 1,
- FILE_PATH_LITERAL("crt"),
+ FILE_PATH_LITERAL("crt"), web_contents,
parent, params);
}
« no previous file with comments | « chrome/browser/ui/certificate_dialogs.h ('k') | chrome/browser/ui/chrome_select_file_policy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698