diff options
30 files changed, 111 insertions, 110 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi index 5794c7d..05c5696 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -36,12 +36,6 @@ 'sql/statement.h', 'sql/transaction.cc', 'sql/transaction.h', - 'win/iat_patch_function.cc', - 'win/iat_patch_function.h', - 'win/scoped_co_mem.h', - 'win/scoped_com_initializer.h', - 'win/shell.cc', - 'win/shell.h', ], }, ], diff --git a/base/base.gypi b/base/base.gypi index 41ea923..79bff9b 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -321,6 +321,8 @@ 'version.h', 'vlog.cc', 'vlog.h', + 'nix/xdg_util.cc', + 'nix/xdg_util.h', 'win/event_trace_consumer.h', 'win/event_trace_controller.cc', 'win/event_trace_controller.h', @@ -328,12 +330,15 @@ 'win/event_trace_provider.h', 'win/i18n.cc', 'win/i18n.h', + 'win/iat_patch_function.cc', + 'win/iat_patch_function.h', 'win/object_watcher.cc', 'win/object_watcher.h', 'win/registry.cc', 'win/registry.h', 'win/scoped_bstr.cc', 'win/scoped_bstr.h', + 'win/scoped_com_initializer.h', 'win/scoped_comptr.h', 'win/scoped_gdi_object.h', 'win/scoped_handle.h', @@ -341,14 +346,12 @@ 'win/scoped_hglobal.h', 'win/scoped_variant.cc', 'win/scoped_variant.h', - 'win/win_util.cc', - 'win/win_util.h', 'win/windows_version.cc', 'win/windows_version.h', + 'win/win_util.cc', + 'win/win_util.h', 'win/wrapped_window_proc.cc', 'win/wrapped_window_proc.h', - 'nix/xdg_util.h', - 'nix/xdg_util.cc', ], 'include_dirs': [ '..', diff --git a/app/win/iat_patch_function.cc b/base/win/iat_patch_function.cc index 9abd6f2..a4a8902 100644 --- a/app/win/iat_patch_function.cc +++ b/base/win/iat_patch_function.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/win/iat_patch_function.h" +#include "base/win/iat_patch_function.h" #include "base/logging.h" #include "base/win/pe_image.h" -namespace app { +namespace base { namespace win { namespace { @@ -275,4 +275,4 @@ DWORD IATPatchFunction::Unpatch() { } } // namespace win -} // namespace app +} // namespace base diff --git a/app/win/iat_patch_function.h b/base/win/iat_patch_function.h index 4a2aa0c..16e7bb0 100644 --- a/app/win/iat_patch_function.h +++ b/base/win/iat_patch_function.h @@ -1,16 +1,16 @@ -// Copyright (c) 2010 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. -#ifndef APP_WIN_IAT_PATCH_FUNCTION_H_ -#define APP_WIN_IAT_PATCH_FUNCTION_H_ +#ifndef BASE_WIN_IAT_PATCH_FUNCTION_H_ +#define BASE_WIN_IAT_PATCH_FUNCTION_H_ #pragma once #include <windows.h> #include "base/basictypes.h" -namespace app { +namespace base { namespace win { // A class that encapsulates Import Address Table patching helpers and restores @@ -67,6 +67,6 @@ class IATPatchFunction { }; } // namespace win -} // namespace app +} // namespace base -#endif // APP_WIN_IAT_PATCH_FUNCTION_H_ +#endif // BASE_WIN_IAT_PATCH_FUNCTION_H_ diff --git a/app/win/scoped_com_initializer.h b/base/win/scoped_com_initializer.h index 3a2cf55..e7e3b4ac 100644 --- a/app/win/scoped_com_initializer.h +++ b/base/win/scoped_com_initializer.h @@ -1,9 +1,9 @@ -// Copyright (c) 2010 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. -#ifndef APP_WIN_SCOPED_COM_INITIALIZER_H_ -#define APP_WIN_SCOPED_COM_INITIALIZER_H_ +#ifndef BASE_WIN_SCOPED_COM_INITIALIZER_H_ +#define BASE_WIN_SCOPED_COM_INITIALIZER_H_ #pragma once #include "base/basictypes.h" @@ -13,7 +13,7 @@ #include <objbase.h> -namespace app { +namespace base { namespace win { // Initializes COM in the constructor (STA), and uninitializes COM in the @@ -35,11 +35,11 @@ class ScopedCOMInitializer { }; } // namespace win -} // namespace app +} // namespace base #else -namespace app { +namespace base { namespace win { // Do-nothing class for other platforms. @@ -53,8 +53,8 @@ class ScopedCOMInitializer { }; } // namespace win -} // namespace app +} // namespace base #endif -#endif // APP_WIN_SCOPED_COM_INITIALIZER_H_ +#endif // BASE_WIN_SCOPED_COM_INITIALIZER_H_ diff --git a/chrome/browser/aeropeek_manager.cc b/chrome/browser/aeropeek_manager.cc index 57df43c..d0fc5e1 100644 --- a/chrome/browser/aeropeek_manager.cc +++ b/chrome/browser/aeropeek_manager.cc @@ -7,7 +7,6 @@ #include <dwmapi.h> #include <shobjidl.h> -#include "app/win/shell.h" #include "base/command_line.h" #include "base/scoped_native_library.h" #include "base/synchronization/waitable_event.h" @@ -35,6 +34,7 @@ #include "skia/ext/image_operations.h" #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/win/shell.h" #include "ui/base/win/window_impl.h" #include "ui/gfx/gdi_util.h" #include "ui/gfx/icon_util.h" @@ -254,7 +254,7 @@ class RegisterThumbnailTask : public Task { // browser icon in the taskbar. // TODO(mattm): This should use ShellIntegration::GetChromiumAppId to work // properly with multiple profiles. - app::win::SetAppIdForWindow( + ui::win::SetAppIdForWindow( BrowserDistribution::GetDistribution()->GetBrowserAppId(), window_); // Register this place-holder window to the taskbar as a child of diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index f913f60..6148ed5 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -158,11 +158,11 @@ // progress and should not be taken as an indication of a real refactoring. #if defined(OS_WIN) +#include <windows.h> #include <commctrl.h> #include <shellapi.h> -#include <windows.h> -#include "app/win/scoped_com_initializer.h" +#include "base/win/scoped_com_initializer.h" #include "base/win/windows_version.h" #include "chrome/browser/browser_trial.h" #include "chrome/browser/browser_util_win.h" @@ -1707,7 +1707,7 @@ int BrowserMain(const MainFunctionParams& parameters) { preconnect_enabled); #if defined(OS_WIN) - app::win::ScopedCOMInitializer com_initializer; + base::win::ScopedCOMInitializer com_initializer; #if defined(GOOGLE_CHROME_BUILD) // Init the RLZ library. This just binds the dll and schedules a task on the diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc index cc1afd9..3577bb0 100644 --- a/chrome/browser/importer/ie_importer.cc +++ b/chrome/browser/importer/ie_importer.cc @@ -15,8 +15,6 @@ #include <string> #include <vector> -#include "app/win/scoped_co_mem.h" -#include "app/win/scoped_com_initializer.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/string_split.h" @@ -24,6 +22,7 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/win/registry.h" +#include "base/win/scoped_com_initializer.h" #include "base/win/scoped_comptr.h" #include "base/win/scoped_handle.h" #include "base/win/windows_version.h" @@ -31,8 +30,9 @@ #include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/password_manager/ie7_password.h" #include "chrome/browser/search_engines/template_url.h" -#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" +#include "chrome/browser/search_engines/template_url_service.h" +#include "chrome/common/scoped_co_mem.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" @@ -89,7 +89,7 @@ void IEImporter::StartImport(const importer::SourceProfile& source_profile, bridge_->NotifyStarted(); // Some IE settings (such as Protected Storage) are obtained via COM APIs. - app::win::ScopedCOMInitializer com_initializer; + base::win::ScopedCOMInitializer com_initializer; if ((items & importer::HOME_PAGE) && !cancelled()) ImportHomepage(); // Doesn't have a UI item. @@ -463,7 +463,7 @@ void IEImporter::ImportHomepage() { } std::wstring IEImporter::ResolveInternetShortcut(const std::wstring& file) { - app::win::ScopedCoMem<wchar_t> url; + chrome::common::ScopedCoMem<wchar_t> url; base::win::ScopedComPtr<IUniformResourceLocator> url_locator; HRESULT result = url_locator.CreateInstance(CLSID_InternetShortcut, NULL, CLSCTX_INPROC_SERVER); diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc index 8ed6136..8c002e3 100644 --- a/chrome/browser/importer/importer_unittest.cc +++ b/chrome/browser/importer/importer_unittest.cc @@ -16,7 +16,6 @@ #include <vector> -#include "app/win/scoped_com_initializer.h" #include "base/compiler_specific.h" #include "base/file_util.h" #include "base/message_loop.h" @@ -25,6 +24,7 @@ #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" +#include "base/win/scoped_com_initializer.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/importer/importer_bridge.h" #include "chrome/browser/importer/importer_data_types.h" @@ -333,7 +333,7 @@ void WritePStore(IPStore* pstore, const GUID* type, const GUID* subtype) { TEST_F(ImporterTest, IEImporter) { // Sets up a favorites folder. - app::win::ScopedCOMInitializer com_init; + base::win::ScopedCOMInitializer com_init; std::wstring path = temp_dir_.path().AppendASCII("Favorites").value(); CreateDirectory(path.c_str(), NULL); CreateDirectory((path + L"\\SubFolder").c_str(), NULL); diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_win.cc index 24f21e1..5399458 100644 --- a/chrome/browser/platform_util_win.cc +++ b/chrome/browser/platform_util_win.cc @@ -9,8 +9,6 @@ #include <shellapi.h> #include <shlobj.h> -#include "app/win/scoped_co_mem.h" -#include "app/win/shell.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" @@ -18,9 +16,11 @@ #include "base/utf_string_conversions.h" #include "base/win/registry.h" #include "base/win/scoped_comptr.h" +#include "chrome/common/scoped_co_mem.h" #include "chrome/installer/util/browser_distribution.h" #include "googleurl/src/gurl.h" #include "ui/base/message_box_win.h" +#include "ui/base/win/shell.h" #include "ui/gfx/native_widget_types.h" namespace platform_util { @@ -66,14 +66,14 @@ void ShowItemInFolder(const FilePath& full_path) { if (FAILED(hr)) return; - app::win::ScopedCoMem<ITEMIDLIST> dir_item; + chrome::common::ScopedCoMem<ITEMIDLIST> dir_item; hr = desktop->ParseDisplayName(NULL, NULL, const_cast<wchar_t *>(dir.value().c_str()), NULL, &dir_item, NULL); if (FAILED(hr)) return; - app::win::ScopedCoMem<ITEMIDLIST> file_item; + chrome::common::ScopedCoMem<ITEMIDLIST> file_item; hr = desktop->ParseDisplayName(NULL, NULL, const_cast<wchar_t *>(full_path.value().c_str()), NULL, &file_item, NULL); @@ -110,7 +110,7 @@ void ShowItemInFolder(const FilePath& full_path) { } void OpenItem(const FilePath& full_path) { - app::win::OpenItemViaShell(full_path); + ui::win::OpenItemViaShell(full_path); } void OpenExternal(const GURL& url) { diff --git a/chrome/browser/tab_contents/web_drop_target_win.cc b/chrome/browser/tab_contents/web_drop_target_win.cc index dfb85005..bff2a58 100644 --- a/chrome/browser/tab_contents/web_drop_target_win.cc +++ b/chrome/browser/tab_contents/web_drop_target_win.cc @@ -41,7 +41,7 @@ DWORD GetPreferredDropEffect(DWORD effect) { } // namespace -// InterstitialDropTarget is like a app::win::DropTarget implementation that +// InterstitialDropTarget is like a base::win::DropTarget implementation that // WebDropTarget passes through to if an interstitial is showing. Rather than // passing messages on to the renderer, we just check to see if there's a link // in the drop data and handle links as navigations. diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index a60947f..04c2ad2 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -5,8 +5,8 @@ #include "chrome/browser/ui/browser.h" #if defined(OS_WIN) -#include <shellapi.h> #include <windows.h> +#include <shellapi.h> #endif // OS_WIN #include <algorithm> @@ -138,13 +138,13 @@ #include "webkit/glue/window_open_disposition.h" #if defined(OS_WIN) -#include "app/win/shell.h" #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/ssl/ssl_error_info.h" #include "chrome/browser/task_manager/task_manager.h" #include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" +#include "ui/base/win/shell.h" #endif // OS_WIN #if defined(OS_MACOSX) @@ -439,7 +439,7 @@ void Browser::InitBrowserWindow() { // Set the app user model id for this application to that of the application // name. See http://crbug.com/7028. - app::win::SetAppIdForWindow( + ui::win::SetAppIdForWindow( is_app() ? ShellIntegration::GetAppId(UTF8ToWide(app_name_), profile_->GetPath()) : ShellIntegration::GetChromiumAppId(profile_->GetPath()), diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc index 2ba748d..e0ea239 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc @@ -11,7 +11,6 @@ #include <richedit.h> #include <textserv.h> -#include "app/win/iat_patch_function.h" #include "base/auto_reset.h" #include "base/basictypes.h" #include "base/i18n/rtl.h" @@ -19,6 +18,7 @@ #include "base/memory/ref_counted.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" +#include "base/win/iat_patch_function.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autocomplete/autocomplete_accessibility.h" #include "chrome/browser/autocomplete/autocomplete_match.h" @@ -348,8 +348,8 @@ class PaintPatcher { private: size_t refcount_; - app::win::IATPatchFunction begin_paint_; - app::win::IATPatchFunction end_paint_; + base::win::IATPatchFunction begin_paint_; + base::win::IATPatchFunction end_paint_; DISALLOW_COPY_AND_ASSIGN(PaintPatcher); }; diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 07ea4aa..b14058a 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -227,6 +227,7 @@ '<(protoc_out_dir)/chrome/common/safe_browsing/client_model.pb.h', '<(protoc_out_dir)/chrome/common/safe_browsing/csd.pb.cc', '<(protoc_out_dir)/chrome/common/safe_browsing/csd.pb.h', + 'common/scoped_co_mem.h', 'common/search_provider.h', 'common/service_messages.h', 'common/service_process_util.cc', diff --git a/chrome/common/chrome_paths_win.cc b/chrome/common/chrome_paths_win.cc index 1892b43..e8cf7e0 100644 --- a/chrome/common/chrome_paths_win.cc +++ b/chrome/common/chrome_paths_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 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. @@ -10,10 +10,10 @@ #include <shlobj.h> #include <shobjidl.h> -#include "app/win/scoped_co_mem.h" #include "base/file_path.h" #include "base/path_service.h" #include "chrome/common/chrome_constants.h" +#include "chrome/common/scoped_co_mem.h" #include "chrome/installer/util/browser_distribution.h" namespace chrome { @@ -71,7 +71,7 @@ bool GetUserDownloadsDirectory(FilePath* result) { REFKNOWNFOLDERID, DWORD, HANDLE, PWSTR*); GetKnownFolderPath f = reinterpret_cast<GetKnownFolderPath>( GetProcAddress(GetModuleHandle(L"shell32.dll"), "SHGetKnownFolderPath")); - app::win::ScopedCoMem<wchar_t> path_buf; + chrome::common::ScopedCoMem<wchar_t> path_buf; if (f && SUCCEEDED(f(FOLDERID_Downloads, 0, NULL, &path_buf))) { *result = FilePath(std::wstring(path_buf)); return true; diff --git a/app/win/scoped_co_mem.h b/chrome/common/scoped_co_mem.h index a6017fa..5950788 100644 --- a/app/win/scoped_co_mem.h +++ b/chrome/common/scoped_co_mem.h @@ -1,21 +1,21 @@ -// Copyright (c) 2010 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. -#ifndef APP_WIN_SCOPED_CO_MEM_H_ -#define APP_WIN_SCOPED_CO_MEM_H_ +#ifndef CHROME_COMMON_SCOPED_CO_MEM_H_ +#define CHROME_COMMON_SCOPED_CO_MEM_H_ #pragma once #include <objbase.h> #include "base/basictypes.h" -namespace app { -namespace win { +namespace chrome { +namespace common { // Simple scoped memory releaser class for COM allocated memory. // Example: -// app::win::ScopedCoMem<ITEMIDLIST> file_item; +// base::win::ScopedCoMem<ITEMIDLIST> file_item; // SHGetSomeInfo(&file_item, ...); // ... // return; <-- memory released @@ -43,7 +43,7 @@ class ScopedCoMem { DISALLOW_COPY_AND_ASSIGN(ScopedCoMem); }; -} // namespace win -} // namespace app +} // namespace common +} // namespace chrome -#endif // APP_WIN_SCOPED_CO_MEM_H_ +#endif // CHROME_COMMON_SCOPED_CO_MEM_H_ diff --git a/chrome/common/win_safe_util.cc b/chrome/common/win_safe_util.cc index ff65a7e..2a5813a 100644 --- a/chrome/common/win_safe_util.cc +++ b/chrome/common/win_safe_util.cc @@ -7,12 +7,12 @@ #include "chrome/common/win_safe_util.h" -#include "app/win/shell.h" #include "base/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/string_util.h" #include "base/win/scoped_comptr.h" +#include "ui/base/win/shell.h" namespace { @@ -70,7 +70,7 @@ bool SaferOpenItemViaShell(HWND hwnd, const std::wstring& window_title, NOTREACHED(); return false; } - return app::win::OpenItemViaShell(full_path); + return ui::win::OpenItemViaShell(full_path); } attachment_services->SetClientGuid(kClientID); @@ -112,7 +112,7 @@ bool SaferOpenItemViaShell(HWND hwnd, const std::wstring& window_title, return false; } } - return app::win::OpenItemViaShellNoZoneCheck(full_path); + return ui::win::OpenItemViaShellNoZoneCheck(full_path); } bool SetInternetZoneIdentifier(const FilePath& full_path, diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc index a616a42..ef3c160 100644 --- a/chrome/renderer/chrome_render_process_observer.cc +++ b/chrome/renderer/chrome_render_process_observer.cc @@ -32,9 +32,9 @@ #include "net/base/net_module.h" #include "third_party/sqlite/sqlite3.h" #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCrossOriginPreflightResultCache.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFontCache.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" @@ -42,7 +42,7 @@ #include "v8/include/v8.h" #if defined(OS_WIN) -#include "app/win/iat_patch_function.h" +#include "base/win/iat_patch_function.h" #endif #if defined(OS_MACOSX) @@ -133,7 +133,7 @@ class RenderViewContentSettingsSetter : public RenderViewVisitor { }; #if defined(OS_WIN) -static app::win::IATPatchFunction g_iat_patch_createdca; +static base::win::IATPatchFunction g_iat_patch_createdca; HDC WINAPI CreateDCAPatch(LPCSTR driver_name, LPCSTR device_name, LPCSTR output, @@ -147,7 +147,7 @@ HDC WINAPI CreateDCAPatch(LPCSTR driver_name, return CreateCompatibleDC(NULL); } -static app::win::IATPatchFunction g_iat_patch_get_font_data; +static base::win::IATPatchFunction g_iat_patch_get_font_data; DWORD WINAPI GetFontDataPatch(HDC hdc, DWORD table, DWORD offset, diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc index 10c577d..2b00945 100644 --- a/chrome/utility/chrome_content_utility_client.cc +++ b/chrome/utility/chrome_content_utility_client.cc @@ -22,10 +22,10 @@ #include "webkit/glue/image_decoder.h" #if defined(OS_WIN) -#include "app/win/iat_patch_function.h" #include "base/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" +#include "base/win/iat_patch_function.h" #include "base/win/scoped_handle.h" #include "content/common/content_switches.h" #include "content/common/sandbox_init_wrapper.h" @@ -193,7 +193,7 @@ typedef bool (*GetPDFDocInfoProc)(const unsigned char* pdf_buffer, // The 2 below IAT patch functions are almost identical to the code in // render_process_impl.cc. This is needed to work around specific Windows APIs // used by the Chrome PDF plugin that will fail in the sandbox. -static app::win::IATPatchFunction g_iat_patch_createdca; +static base::win::IATPatchFunction g_iat_patch_createdca; HDC WINAPI UtilityProcess_CreateDCAPatch(LPCSTR driver_name, LPCSTR device_name, LPCSTR output, @@ -207,7 +207,7 @@ HDC WINAPI UtilityProcess_CreateDCAPatch(LPCSTR driver_name, return CreateDCA(driver_name, device_name, output, init_data); } -static app::win::IATPatchFunction g_iat_patch_get_font_data; +static base::win::IATPatchFunction g_iat_patch_get_font_data; DWORD WINAPI UtilityProcess_GetFontDataPatch( HDC hdc, DWORD table, DWORD offset, LPVOID buffer, DWORD length) { int rv = GetFontData(hdc, table, offset, buffer, length); diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index c29742d..12d4d96 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -9,7 +9,6 @@ #include <exdisp.h> #include "app/app_paths.h" -#include "app/win/scoped_com_initializer.h" #include "base/command_line.h" #include "base/debug/debugger.h" #include "base/file_util.h" @@ -23,6 +22,7 @@ #include "base/system_monitor/system_monitor.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" +#include "base/win/scoped_com_initializer.h" #include "base/win/scoped_comptr.h" #include "base/win/scoped_handle.h" #include "chrome/browser/automation/automation_provider_list.h" @@ -311,7 +311,7 @@ void CFUrlRequestUnittestRunner::StartChromeFrameInHostBrowser() { if (!ShouldLaunchBrowser()) return; - app::win::ScopedCOMInitializer com; + base::win::ScopedCOMInitializer com; chrome_frame_test::CloseAllIEWindows(); test_http_server_.reset(new test_server::SimpleWebServer(kTestServerPort)); @@ -333,7 +333,7 @@ void CFUrlRequestUnittestRunner::StartChromeFrameInHostBrowser() { void CFUrlRequestUnittestRunner::ShutDownHostBrowser() { if (ShouldLaunchBrowser()) { - app::win::ScopedCOMInitializer com; + base::win::ScopedCOMInitializer com; chrome_frame_test::CloseAllIEWindows(); } } diff --git a/chrome_frame/test/url_request_test.cc b/chrome_frame/test/url_request_test.cc index a4a32cd..ab90f47 100644 --- a/chrome_frame/test/url_request_test.cc +++ b/chrome_frame/test/url_request_test.cc @@ -5,15 +5,15 @@ #include <atlbase.h> #include <atlcom.h> -#include "app/win/scoped_com_initializer.h" +#include "base/win/scoped_com_initializer.h" #include "chrome/common/automation_messages.h" #include "chrome_frame/test/chrome_frame_test_utils.h" #include "chrome_frame/test/test_server.h" #include "chrome_frame/test/test_with_web_server.h" #include "chrome_frame/urlmon_url_request.h" #include "chrome_frame/urlmon_url_request_private.h" -#include "testing/gmock_mutant.h" #include "testing/gmock/include/gmock/gmock.h" +#include "testing/gmock_mutant.h" #include "testing/gtest/include/gtest/gtest.h" using testing::CreateFunctor; @@ -74,7 +74,7 @@ TEST(UrlmonUrlRequestTest, Simple1) { chrome_frame_test::GetTestDataFolder()); mock_server.ExpectAndServeAnyRequests(CFInvocation(CFInvocation::NONE)); - app::win::ScopedCOMInitializer init_com; + base::win::ScopedCOMInitializer init_com; CComObjectStackEx<UrlmonUrlRequest> request; request.AddRef(); @@ -123,7 +123,7 @@ TEST(UrlmonUrlRequestTest, Head) { test_server::SimpleResponse head_response("/head", ""); server.AddResponse(&head_response); - app::win::ScopedCOMInitializer init_com; + base::win::ScopedCOMInitializer init_com; CComObjectStackEx<UrlmonUrlRequest> request; request.AddRef(); @@ -160,7 +160,7 @@ TEST(UrlmonUrlRequestTest, Head) { TEST(UrlmonUrlRequestTest, UnreachableUrl) { MockUrlDelegate mock; chrome_frame_test::TimedMsgLoop loop; - app::win::ScopedCOMInitializer init_com; + base::win::ScopedCOMInitializer init_com; CComObjectStackEx<UrlmonUrlRequest> request; testing::StrictMock<MockWebServer> mock_server(1337, L"127.0.0.1", @@ -206,7 +206,7 @@ TEST(UrlmonUrlRequestTest, ZeroLengthResponse) { chrome_frame_test::GetTestDataFolder()); mock_server.ExpectAndServeAnyRequests(CFInvocation(CFInvocation::NONE)); - app::win::ScopedCOMInitializer init_com; + base::win::ScopedCOMInitializer init_com; CComObjectStackEx<UrlmonUrlRequest> request; request.AddRef(); diff --git a/content/browser/geolocation/win7_location_api_win.h b/content/browser/geolocation/win7_location_api_win.h index 4a33ab1..c648b8c 100644 --- a/content/browser/geolocation/win7_location_api_win.h +++ b/content/browser/geolocation/win7_location_api_win.h @@ -1,18 +1,18 @@ -// Copyright (c) 2010 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. #ifndef CONTENT_BROWSER_GEOLOCATION_WIN7_LOCATION_API_WIN_H_ #define CONTENT_BROWSER_GEOLOCATION_WIN7_LOCATION_API_WIN_H_ +#include <windows.h> #include <atlbase.h> #include <atlcom.h> #include <locationapi.h> #include <sensors.h> -#include <Windows.h> -#include "app/win/scoped_com_initializer.h" #include "base/time.h" +#include "base/win/scoped_com_initializer.h" struct Geoposition; @@ -50,7 +50,7 @@ class Win7LocationApi { virtual bool GetPositionIfFixed(Geoposition* position); // Ensure that COM has been initialized for this thread. - app::win::ScopedCOMInitializer com_initializer_; + base::win::ScopedCOMInitializer com_initializer_; // ILocation object that lets us communicate with the Location and // Sensors platform. CComPtr<ILocation> locator_; diff --git a/content/common/gpu/gpu_channel_manager.cc b/content/common/gpu/gpu_channel_manager.cc index 21187c6..14b69eb 100644 --- a/content/common/gpu/gpu_channel_manager.cc +++ b/content/common/gpu/gpu_channel_manager.cc @@ -7,9 +7,9 @@ #include <string> #include <vector> -#include "app/win/scoped_com_initializer.h" #include "base/command_line.h" #include "base/threading/worker_pool.h" +#include "base/win/scoped_com_initializer.h" #include "build/build_config.h" #include "content/common/child_process.h" #include "content/common/gpu/gpu_messages.h" diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index ec62d13..62336cc 100644 --- a/content/gpu/gpu_child_thread.cc +++ b/content/gpu/gpu_child_thread.cc @@ -7,9 +7,9 @@ #include <string> #include <vector> -#include "app/win/scoped_com_initializer.h" #include "base/command_line.h" #include "base/threading/worker_pool.h" +#include "base/win/scoped_com_initializer.h" #include "build/build_config.h" #include "content/common/child_process.h" #include "content/common/content_client.h" @@ -259,7 +259,7 @@ void GpuChildThread::OnHang() { // Runs on a worker thread. The GPU process never terminates voluntarily so // it is safe to assume that its message loop is valid. void GpuChildThread::CollectDxDiagnostics(GpuChildThread* thread) { - app::win::ScopedCOMInitializer com_initializer; + base::win::ScopedCOMInitializer com_initializer; DxDiagNode node; gpu_info_collector::GetDxDiagnostics(&node); diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index 422175c..cea11e6 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -8,11 +8,11 @@ #include <windows.h> #endif -#include "app/win/scoped_com_initializer.h" #include "base/environment.h" #include "base/message_loop.h" #include "base/stringprintf.h" #include "base/threading/platform_thread.h" +#include "base/win/scoped_com_initializer.h" #include "build/build_config.h" #include "content/common/content_switches.h" #include "content/common/gpu/gpu_config.h" @@ -57,7 +57,7 @@ int GpuMain(const MainFunctionParams& parameters) { #endif } - app::win::ScopedCOMInitializer com_initializer; + base::win::ScopedCOMInitializer com_initializer; // We can not tolerate early returns from this code, because the // detection of early return of a child process is implemented using diff --git a/app/win/shell.cc b/ui/base/win/shell.cc index cf47387..c78730c 100644 --- a/app/win/shell.cc +++ b/ui/base/win/shell.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/win/shell.h" +#include "ui/base/win/shell.h" #include <shellapi.h> #include <shlobj.h> @@ -14,7 +14,7 @@ #include "base/win/win_util.h" #include "base/win/windows_version.h" -namespace app { +namespace ui { namespace win { namespace { @@ -109,4 +109,4 @@ void SetAppIdForWindow(const string16& app_id, HWND hwnd) { } } // namespace win -} // namespace app +} // namespace ui diff --git a/app/win/shell.h b/ui/base/win/shell.h index 44ee3ba7..cc32477 100644 --- a/app/win/shell.h +++ b/ui/base/win/shell.h @@ -1,9 +1,10 @@ -// Copyright (c) 2010 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. -#ifndef APP_WIN_SHELL_H_ -#define APP_WIN_SHELL_H_ +#ifndef UI_BASE_WIN_SHELL_H_ +#define UI_BASE_WIN_SHELL_H_ +#pragma once #include <windows.h> @@ -11,7 +12,7 @@ class FilePath; -namespace app { +namespace ui { namespace win { // Open or run a file via the Windows shell. In the event that there is no @@ -36,6 +37,6 @@ bool OpenItemWithExternalApp(const string16& full_path); void SetAppIdForWindow(const string16& app_id, HWND hwnd); } // namespace win -} // namespace app +} // namespace ui -#endif // APP_WIN_SHELL_H_ +#endif // UI_BASE_WIN_SHELL_H_ diff --git a/ui/ui_base.gypi b/ui/ui_base.gypi index b602b16..3468eaa 100644 --- a/ui/ui_base.gypi +++ b/ui/ui_base.gypi @@ -152,6 +152,8 @@ 'base/win/hwnd_util.h', 'base/win/ime_input.cc', 'base/win/ime_input.h', + 'base/win/shell.cc', + 'base/win/shell.h', 'base/win/window_impl.cc', 'base/win/window_impl.h', 'base/x/active_window_watcher_x.cc', diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc index 4f3b806..c3f010b 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc +++ b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc @@ -8,7 +8,6 @@ #include <string> #include <vector> -#include "app/win/iat_patch_function.h" #include "base/file_util.h" #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" @@ -19,6 +18,7 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/version.h" +#include "base/win/iat_patch_function.h" #include "base/win/registry.h" #include "base/win/windows_version.h" #include "skia/ext/platform_canvas.h" @@ -75,15 +75,15 @@ base::LazyInstance<std::map<HWND, WNDPROC> > g_window_handle_proc_map( // Helper object for patching the TrackPopupMenu API. -base::LazyInstance<app::win::IATPatchFunction> g_iat_patch_track_popup_menu( +base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_track_popup_menu( base::LINKER_INITIALIZED); // Helper object for patching the SetCursor API. -base::LazyInstance<app::win::IATPatchFunction> g_iat_patch_set_cursor( +base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_set_cursor( base::LINKER_INITIALIZED); // Helper object for patching the RegEnumKeyExW API. -base::LazyInstance<app::win::IATPatchFunction> g_iat_patch_reg_enum_key_ex_w( +base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_reg_enum_key_ex_w( base::LINKER_INITIALIZED); // http://crbug.com/16114 diff --git a/webkit/tools/test_shell/mac/webwidget_host.mm b/webkit/tools/test_shell/mac/webwidget_host.mm index 7610644..b718c80 100644 --- a/webkit/tools/test_shell/mac/webwidget_host.mm +++ b/webkit/tools/test_shell/mac/webwidget_host.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 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. @@ -8,12 +8,12 @@ #include "base/logging.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFactory.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFactory.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFactory.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFactory.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" #include "webkit/glue/webkit_glue.h" @@ -30,7 +30,7 @@ using WebKit::WebScreenInfoFactory; using WebKit::WebSize; using WebKit::WebWidgetClient; -/*static*/ +// static WebWidgetHost* WebWidgetHost::Create(NSView* parent_view, WebWidgetClient* client) { WebWidgetHost* host = new WebWidgetHost(); @@ -41,7 +41,7 @@ WebWidgetHost* WebWidgetHost::Create(NSView* parent_view, host->view_ = [[NSView alloc] initWithFrame:content_rect]; [parent_view addSubview:host->view_]; - // app::win::SetWindowUserData(host->hwnd_, host); + // base::win::SetWindowUserData(host->hwnd_, host); host->webwidget_ = WebPopupMenu::create(client); host->webwidget_->resize(WebSize(content_rect.size.width, @@ -155,7 +155,7 @@ WebWidgetHost::WebWidgetHost() } WebWidgetHost::~WebWidgetHost() { - // app::win::SetWindowUserData(hwnd_, 0); + // base::win::SetWindowUserData(hwnd_, 0); webwidget_->close(); } |