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

chrome/browser/ui/webui/options/certificate_manager_handler.cc

 // 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.
 
 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"  // for FileAccessProvider
 #include "base/memory/scoped_vector.h"
 #include "base/safe_strerror_posix.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/ui/crypto_module_password_dialog.h"
-#include "chrome/browser/ui/gtk/certificate_dialogs.h"
+#include "chrome/browser/ui/certificate_dialogs.h"

[sky, 2011/11/15 20:33:48]

sort

 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/public/browser/browser_thread.h"  // for FileAccessProvider
 #include "grit/generated_resources.h"
 #include "net/base/crypto_module.h"
 #include "net/base/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_collator.h"
 
 #if defined(OS_CHROMEOS)
@@ skipping 1009 matching lines @@
   // TODO(xiyuan): Use async way when underlying supports it.
   base::FundamentalValue ready(cryptohome->Pkcs11IsTpmTokenReady());
   web_ui_->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady",
                                   ready);
 }
 #endif
 
 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
   return web_ui_->tab_contents()->view()->GetTopLevelNativeWindow();
 }