diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-25 01:38:59 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-25 01:38:59 +0000 |
| commit | 541434c24710c131b697cf461fc3a21ddb74ed39 (patch) | |
| tree | c9c445ea4d5e2c95a7f5dd3fc3cd04078f9b3545 /webkit/plugins | |
| parent | 60d2744cf0fbc02b5255407a6d03abb21a264dc5 (diff) | |
| download | chromium_src-541434c24710c131b697cf461fc3a21ddb74ed39.zip chromium_src-541434c24710c131b697cf461fc3a21ddb74ed39.tar.gz chromium_src-541434c24710c131b697cf461fc3a21ddb74ed39.tar.bz2 | |
Revert 90464 - Move app/win/* files to base/win/, ui/base/win and chrome/common/ directories.
BUG=72317
TEST=None
R=rsesek@chromium.org,brettw@chromium.org
Review URL: http://codereview.chromium.org/7231016
TBR=tfarina@chromium.org
Review URL: http://codereview.chromium.org/7265009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins')
| -rw-r--r-- | webkit/plugins/npapi/webplugin_delegate_impl_win.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc index c3f010b..4f3b806 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc +++ b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc @@ -8,6 +8,7 @@ #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" @@ -18,7 +19,6 @@ #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<base::win::IATPatchFunction> g_iat_patch_track_popup_menu( +base::LazyInstance<app::win::IATPatchFunction> g_iat_patch_track_popup_menu( base::LINKER_INITIALIZED); // Helper object for patching the SetCursor API. -base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_set_cursor( +base::LazyInstance<app::win::IATPatchFunction> g_iat_patch_set_cursor( base::LINKER_INITIALIZED); // Helper object for patching the RegEnumKeyExW API. -base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_reg_enum_key_ex_w( +base::LazyInstance<app::win::IATPatchFunction> g_iat_patch_reg_enum_key_ex_w( base::LINKER_INITIALIZED); // http://crbug.com/16114 |