diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/npapi/webplugin_delegate_impl_win.cc | 8 | ||||
| -rw-r--r-- | webkit/tools/test_shell/mac/webwidget_host.mm | 4 |
2 files changed, 6 insertions, 6 deletions
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 1afefdc..a6e1e9c 100644 --- a/webkit/tools/test_shell/mac/webwidget_host.mm +++ b/webkit/tools/test_shell/mac/webwidget_host.mm @@ -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); + // ui::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); + // ui::SetWindowUserData(hwnd_, 0); webwidget_->close(); } |