diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 01:59:15 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 01:59:15 +0000 |
| commit | 935aa54d9a5e2e617c61c9f8dcea398768413443 (patch) | |
| tree | 3df9ec9316cd4d5b7171e5c6c869a01d823cc507 /webkit/glue | |
| parent | 7d1f3348c26eda2d1656860c821d335bf94d4cda (diff) | |
| download | chromium_src-935aa54d9a5e2e617c61c9f8dcea398768413443.zip chromium_src-935aa54d9a5e2e617c61c9f8dcea398768413443.tar.gz chromium_src-935aa54d9a5e2e617c61c9f8dcea398768413443.tar.bz2 | |
Move windows version-related stuff out of base/win_util and into base/win/windows_version. Many files now only need to include this instead of all of win_util.
Remove a bunch of unused code from base/win_util. There was a surprising amount.
Replace the AppUserModel property key with the one from the SDK now that we use the Win7 SDK. Move GetLogonSessionOnlyDACL from win_util to ipc since it's only used in that one place.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3823002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62694 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/plugins/pepper_scrollbar.cc | 4 | ||||
| -rw-r--r-- | webkit/glue/plugins/webplugin_delegate_impl_win.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/webkit/glue/plugins/pepper_scrollbar.cc b/webkit/glue/plugins/pepper_scrollbar.cc index c265851..88a3f9b 100644 --- a/webkit/glue/plugins/pepper_scrollbar.cc +++ b/webkit/glue/plugins/pepper_scrollbar.cc @@ -19,7 +19,7 @@ #include "webkit/glue/webkit_glue.h" #if defined(OS_WIN) -#include "base/win_util.h" +#include "base/win/windows_version.h" #endif using WebKit::WebInputEvent; @@ -164,7 +164,7 @@ bool Scrollbar::Paint(const PP_Rect* rect, ImageData* image) { scrollbar_->paint(webkit_glue::ToWebCanvas(canvas), gfx_rect); #if defined(OS_WIN) - if (win_util::GetWinVersion() == win_util::WINVERSION_XP) { + if (base::win::GetVersion() == base::win::VERSION_XP) { canvas->getTopPlatformDevice().makeOpaque( gfx_rect.x(), gfx_rect.y(), gfx_rect.width(), gfx_rect.height()); } diff --git a/webkit/glue/plugins/webplugin_delegate_impl_win.cc b/webkit/glue/plugins/webplugin_delegate_impl_win.cc index 115a494..867727f 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl_win.cc +++ b/webkit/glue/plugins/webplugin_delegate_impl_win.cc @@ -19,7 +19,7 @@ #include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/win_util.h" +#include "base/win/windows_version.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" #include "webkit/glue/plugins/default_plugin_shared.h" @@ -415,7 +415,7 @@ bool WebPluginDelegateImpl::PlatformInitialize() { // name of the current process. We do it in the installer for admin users, // for the rest patch this function. if ((quirks_ & PLUGIN_QUIRK_PATCH_REGENUMKEYEXW) && - win_util::GetWinVersion() == win_util::WINVERSION_XP && + base::win::GetVersion() == base::win::VERSION_XP && !RegKey().Open(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\MediaPlayer\\ShimInclusionList\\chrome.exe", KEY_READ) && |