Move pe_image and registry from base to base/win and use the namespace. It re...

chrome/browser/views/shell_dialogs_win.cc

 // Copyright (c) 2010 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/shell_dialogs.h"
 
 #include <windows.h>
 #include <commdlg.h>
 #include <shlobj.h>
 
 #include <algorithm>
 #include <set>
 
 #include "app/l10n_util.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
-#include "base/registry.h"
 #include "base/scoped_comptr_win.h"
 #include "base/string_split.h"
 #include "base/thread.h"
 #include "base/utf_string_conversions.h"
+#include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/browser_thread.h"
 #include "gfx/font.h"
 #include "grit/app_strings.h"
 #include "grit/generated_resources.h"
 
 // This function takes the output of a SaveAs dialog: a filename, a filter and
 // the extension originally suggested to the user (shown in the dialog box) and
 // returns back the filename with the appropriate extension tacked on. If the
 // user requests an unknown extension and is not using the 'All files' filter,
@@ skipping 10 matching lines @@
   std::wstring return_value = filename;
 
   // If we wanted a specific extension, but the user's filename deleted it or
   // changed it to something that the system doesn't understand, re-append.
   // Careful: Checking net::GetMimeTypeFromExtension() will only find
   // extensions with a known MIME type, which many "known" extensions on Windows
   // don't have.  So we check directly for the "known extension" registry key.
   std::wstring file_extension(file_util::GetFileExtensionFromPath(filename));
   std::wstring key(L"." + file_extension);
   if (!(filter_selected.empty() || filter_selected == L"*.*") &&
-      !RegKey(HKEY_CLASSES_ROOT, key.c_str(), KEY_READ).Valid() &&
+      !base::win::RegKey(HKEY_CLASSES_ROOT, key.c_str(), KEY_READ).Valid() &&
       file_extension != suggested_ext) {
     if (return_value[return_value.length() - 1] != L'.')
       return_value.append(L".");
     return_value.append(suggested_ext);
   }
 
   // Strip any trailing dots, which Windows doesn't allow.
   size_t index = return_value.find_last_not_of(L'.');
   if (index < return_value.size() - 1)
     return_value.resize(index + 1);
 
   return return_value;
 }
 
 namespace {
 
 // Get the file type description from the registry. This will be "Text Document"
 // for .txt files, "JPEG Image" for .jpg files, etc. If the registry doesn't
 // have an entry for the file type, we return false, true if the description was
 // found. 'file_ext' must be in form ".txt".
 static bool GetRegistryDescriptionFromExtension(const std::wstring& file_ext,
                                                 std::wstring* reg_description) {
   DCHECK(reg_description);
-  RegKey reg_ext(HKEY_CLASSES_ROOT, file_ext.c_str(), KEY_READ);
+  base::win::RegKey reg_ext(HKEY_CLASSES_ROOT, file_ext.c_str(), KEY_READ);
   std::wstring reg_app;
   if (reg_ext.ReadValue(NULL, &reg_app) && !reg_app.empty()) {
-    RegKey reg_link(HKEY_CLASSES_ROOT, reg_app.c_str(), KEY_READ);
+    base::win::RegKey reg_link(HKEY_CLASSES_ROOT, reg_app.c_str(), KEY_READ);
     if (reg_link.ReadValue(NULL, reg_description))
       return true;
   }
   return false;
 }
 
 // Set up a filter for a Save/Open dialog, which will consist of |file_ext| file
 // extensions (internally separated by semicolons), |ext_desc| as the text
 // descriptions of the |file_ext| types (optional), and (optionally) the default
 // 'All Files' view. The purpose of the filter is to show only files of a
@@ skipping 1030 matching lines @@
 void SelectFontDialogImpl::FontNotSelected(void* params, RunState run_state) {
   if (listener_)
     listener_->FontSelectionCanceled(params);
   EndRun(run_state);
 }
 
 // static
 SelectFontDialog* SelectFontDialog::Create(Listener* listener) {
   return new SelectFontDialogImpl(listener);
 }