Skip to content

GitLab

T
tangled
Commit a0f17be2 authored by benrg@chromium.org's avatar benrg@chromium.org
Browse files
Options

move chrome/browser/ui/gtk/certificate_viewer.* to chrome/browser/ui, add it to 

the aura build, and delete the stubs (which were ifdef'd out in Windows)


BUG=102946
TEST=none


Review URL: http://codereview.chromium.org/8543001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110364 0039d316-1c4b-4281-b951-d872f2087c98
parent 3750c787
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 32 deletions
chrome/browser/ui/gtk/certificate_dialogs.cc → chrome/browser/ui/certificate_dialogs.cc
View file @ a0f17be2
...@@ -2,9 +2,7 @@ ...@@ -2,9 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// TODO(mattm): this isn't gtk specific, it shouldn't be under the gtk dir #include "chrome/browser/ui/certificate_dialogs.h"
#include "chrome/browser/ui/gtk/certificate_dialogs.h"
#include <vector> #include <vector>
......
chrome/browser/ui/gtk/certificate_dialogs.h → chrome/browser/ui/certificate_dialogs.h
View file @ a0f17be2
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_GTK_CERTIFICATE_DIALOGS_H_ #ifndef CHROME_BROWSER_UI_CERTIFICATE_DIALOGS_H_
#define CHROME_BROWSER_UI_GTK_CERTIFICATE_DIALOGS_H_ #define CHROME_BROWSER_UI_CERTIFICATE_DIALOGS_H_
#pragma once #pragma once
#include "chrome/browser/ui/select_file_dialog.h" #include "chrome/browser/ui/select_file_dialog.h"
...@@ -20,4 +20,4 @@ void ShowCertExportDialog(TabContents* tab_contents, ...@@ -20,4 +20,4 @@ void ShowCertExportDialog(TabContents* tab_contents,
gfx::NativeWindow parent, gfx::NativeWindow parent,
net::X509Certificate::OSCertHandle cert); net::X509Certificate::OSCertHandle cert);
#endif // CHROME_BROWSER_UI_GTK_CERTIFICATE_DIALOGS_H_ #endif // CHROME_BROWSER_UI_CERTIFICATE_DIALOGS_H_
chrome/browser/ui/gtk/certificate_viewer.cc
View file @ a0f17be2
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "base/time.h" #include "base/time.h"
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
#include "chrome/browser/certificate_viewer.h" #include "chrome/browser/certificate_viewer.h"
#include "chrome/browser/ui/gtk/certificate_dialogs.h" #include "chrome/browser/ui/certificate_dialogs.h"
#include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/gtk_util.h"
#include "chrome/common/net/x509_certificate_model.h" #include "chrome/common/net/x509_certificate_model.h"
#include "grit/generated_resources.h" #include "grit/generated_resources.h"
......
chrome/browser/ui/views/stubs_aura.cc
View file @ a0f17be2
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "chrome/browser/first_run/first_run_import_observer.h" #include "chrome/browser/first_run/first_run_import_observer.h"
#include "chrome/browser/ui/views/first_run_bubble.h" #include "chrome/browser/ui/views/first_run_bubble.h"
#else #else
#include "chrome/browser/ui/gtk/certificate_dialogs.h" #include "chrome/browser/ui/certificate_dialogs.h"
#endif #endif
#if defined(USE_NSS) #if defined(USE_NSS)
...@@ -77,24 +77,6 @@ void ShowCertificateViewer(gfx::NativeWindow parent, ...@@ -77,24 +77,6 @@ void ShowCertificateViewer(gfx::NativeWindow parent,
net::X509Certificate* cert) { net::X509Certificate* cert) {
// No certificate viewer on Windows. // No certificate viewer on Windows.
} }
#else
void ShowCertSelectFileDialog(SelectFileDialog* select_file_dialog,
SelectFileDialog::Type type,
const FilePath& suggested_path,
TabContents* tab_contents,
gfx::NativeWindow parent,
void* params) {
// TODO(saintlou);
NOTIMPLEMENTED();
}
void ShowCertExportDialog(TabContents* tab_contents,
gfx::NativeWindow parent,
net::X509Certificate::OSCertHandle cert) {
// TODO(saintlou);
NOTIMPLEMENTED();
}
#endif // OS_WIN #endif // OS_WIN
namespace importer { namespace importer {
......
chrome/browser/ui/webui/certificate_viewer_webui.cc
View file @ a0f17be2
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/gtk/certificate_dialogs.h" #include "chrome/browser/ui/certificate_dialogs.h"
#include "chrome/browser/ui/webui/chrome_web_ui.h" #include "chrome/browser/ui/webui/chrome_web_ui.h"
#include "chrome/common/net/x509_certificate_model.h" #include "chrome/common/net/x509_certificate_model.h"
#include "chrome/common/url_constants.h" #include "chrome/common/url_constants.h"
......
chrome/browser/ui/webui/options/certificate_manager_handler.cc
View file @ a0f17be2
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include "base/values.h" #include "base/values.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/certificate_viewer.h" #include "chrome/browser/certificate_viewer.h"
#include "chrome/browser/ui/certificate_dialogs.h"
#include "chrome/browser/ui/crypto_module_password_dialog.h" #include "chrome/browser/ui/crypto_module_password_dialog.h"
#include "chrome/browser/ui/gtk/certificate_dialogs.h"
#include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents.h"
#include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/tab_contents/tab_contents_view.h"
#include "content/public/browser/browser_thread.h" // for FileAccessProvider #include "content/public/browser/browser_thread.h" // for FileAccessProvider
......
chrome/chrome_browser.gypi
View file @ a0f17be2
...@@ -2427,6 +2427,8 @@ ...@@ -2427,6 +2427,8 @@
'browser/ui/browser_tab_restore_service_delegate.cc', 'browser/ui/browser_tab_restore_service_delegate.cc',
'browser/ui/browser_tab_restore_service_delegate.h', 'browser/ui/browser_tab_restore_service_delegate.h',
'browser/ui/browser_window.h', 'browser/ui/browser_window.h',
'browser/ui/certificate_dialogs.cc',
'browser/ui/certificate_dialogs.h',
'browser/ui/cocoa/about_ipc_controller.h', 'browser/ui/cocoa/about_ipc_controller.h',
'browser/ui/cocoa/about_ipc_controller.mm', 'browser/ui/cocoa/about_ipc_controller.mm',
'browser/ui/cocoa/about_ipc_dialog.h', 'browser/ui/cocoa/about_ipc_dialog.h',
...@@ -2945,8 +2947,6 @@ ...@@ -2945,8 +2947,6 @@
'browser/ui/gtk/bubble/bubble_gtk.h', 'browser/ui/gtk/bubble/bubble_gtk.h',
'browser/ui/gtk/cairo_cached_surface.cc', 'browser/ui/gtk/cairo_cached_surface.cc',
'browser/ui/gtk/cairo_cached_surface.h', 'browser/ui/gtk/cairo_cached_surface.h',
'browser/ui/gtk/certificate_dialogs.cc',
'browser/ui/gtk/certificate_dialogs.h',
'browser/ui/gtk/certificate_viewer.cc', 'browser/ui/gtk/certificate_viewer.cc',
'browser/ui/gtk/chrome_gtk_frame.cc', 'browser/ui/gtk/chrome_gtk_frame.cc',
'browser/ui/gtk/chrome_gtk_frame.h', 'browser/ui/gtk/chrome_gtk_frame.h',
...@@ -4372,6 +4372,8 @@ ...@@ -4372,6 +4372,8 @@
'browser/jankometer.cc', 'browser/jankometer.cc',
'browser/password_manager/login_database_posix.cc', 'browser/password_manager/login_database_posix.cc',
'browser/ui/browser_list_stub.cc', 'browser/ui/browser_list_stub.cc',
'browser/ui/certificate_dialogs.cc',
'browser/ui/certificate_dialogs.h',
'browser/ui/crypto_module_password_dialog_nss.cc', 'browser/ui/crypto_module_password_dialog_nss.cc',
'browser/ui/panels/panel_browser_frame_view.cc', 'browser/ui/panels/panel_browser_frame_view.cc',
'browser/ui/panels/panel_browser_frame_view.h', 'browser/ui/panels/panel_browser_frame_view.h',
...@@ -4544,6 +4546,8 @@ ...@@ -4544,6 +4546,8 @@
'browser/importer/nss_decryptor_system_nss.cc', 'browser/importer/nss_decryptor_system_nss.cc',
'browser/importer/nss_decryptor_system_nss.h', 'browser/importer/nss_decryptor_system_nss.h',
'browser/ui/browser_list_stub.cc', 'browser/ui/browser_list_stub.cc',
'browser/ui/certificate_dialogs.cc',
'browser/ui/certificate_dialogs.h',
'browser/ui/crypto_module_password_dialog_nss.cc', 'browser/ui/crypto_module_password_dialog_nss.cc',
'browser/ui/login/login_prompt_ui.cc', 'browser/ui/login/login_prompt_ui.cc',
'browser/ui/panels/panel_mouse_watcher_timer.cc', 'browser/ui/panels/panel_mouse_watcher_timer.cc',
...@@ -4621,8 +4625,6 @@ ...@@ -4621,8 +4625,6 @@
['include', '^browser/ui/gtk/bookmarks/bookmark_utils_gtk.h'], ['include', '^browser/ui/gtk/bookmarks/bookmark_utils_gtk.h'],
['include', '^browser/ui/gtk/cairo_cached_surface.cc'], ['include', '^browser/ui/gtk/cairo_cached_surface.cc'],
['include', '^browser/ui/gtk/cairo_cached_surface.h'], ['include', '^browser/ui/gtk/cairo_cached_surface.h'],
['include', '^browser/ui/gtk/certificate_dialogs.cc'],
['include', '^browser/ui/gtk/certificate_dialogs.h'],
['include', '^browser/ui/gtk/certificate_viewer.cc'], ['include', '^browser/ui/gtk/certificate_viewer.cc'],
['include', '^browser/ui/gtk/chrome_gtk_frame.cc'], ['include', '^browser/ui/gtk/chrome_gtk_frame.cc'],
['include', '^browser/ui/gtk/chrome_gtk_frame.h'], ['include', '^browser/ui/gtk/chrome_gtk_frame.h'],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment