summaryrefslogtreecommitdiffstats
path: root/base/window_impl.cc
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-14 01:12:38 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-14 01:12:38 +0000
commitd60cd48c0f4e822b3f14b72ef95667845aefce29 (patch)
tree0ff1158c36c6b60be74bf23bec59bd08726e9287 /base/window_impl.cc
parented3ce0d59e2f52f805a8a76b112bfd48156416d0 (diff)
downloadchromium_src-d60cd48c0f4e822b3f14b72ef95667845aefce29.zip
chromium_src-d60cd48c0f4e822b3f14b72ef95667845aefce29.tar.gz
chromium_src-d60cd48c0f4e822b3f14b72ef95667845aefce29.tar.bz2
Change PluginInstallImpl to use base::WindowImpl instead of CWindowImpl to reduce a dependency on ATL.
BUG=5023 TEST=Uninstall flash. Visit hulu.com and install the flash plugin. Review URL: http://codereview.chromium.org/165469 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23406 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/window_impl.cc')
-rw-r--r--base/window_impl.cc18
1 files changed, 4 insertions, 14 deletions
diff --git a/base/window_impl.cc b/base/window_impl.cc
index 4a37f7b..c3b3ad4 100644
--- a/base/window_impl.cc
+++ b/base/window_impl.cc
@@ -96,7 +96,7 @@ class ClassRegistrar {
typedef std::list<RegisteredClass> RegisteredClasses;
RegisteredClasses registered_classes_;
- // Counter of how many classes have ben registered so far.
+ // Counter of how many classes have been registered so far.
int registered_count_;
DISALLOW_COPY_AND_ASSIGN(ClassRegistrar);
@@ -136,7 +136,7 @@ void WindowImpl::Init(HWND parent, const gfx::Rect& bounds) {
height = bounds.height();
}
- hwnd_ = CreateWindowEx(window_ex_style_, GetWindowClassName().c_str(), L"",
+ hwnd_ = CreateWindowEx(window_ex_style_, GetWindowClassName().c_str(), NULL,
window_style_, x, y, width, height,
parent, NULL, NULL, this);
DCHECK(hwnd_);
@@ -145,27 +145,17 @@ void WindowImpl::Init(HWND parent, const gfx::Rect& bounds) {
DCHECK(win_util::GetWindowUserData(hwnd_) == this);
}
-gfx::NativeView WindowImpl::GetNativeView() const {
- return hwnd_;
-}
-
HICON WindowImpl::GetDefaultWindowIcon() const {
return NULL;
}
-BOOL WindowImpl::DestroyWindow() {
- DCHECK(::IsWindow(GetNativeView()));
- return ::DestroyWindow(GetNativeView());
-}
-
LRESULT WindowImpl::OnWndProc(UINT message, WPARAM w_param, LPARAM l_param) {
- HWND window = GetNativeView();
LRESULT result = 0;
// Handle the message if it's in our message map; otherwise, let the system
// handle it.
- if (!ProcessWindowMessage(window, message, w_param, l_param, result))
- result = DefWindowProc(window, message, w_param, l_param);
+ if (!ProcessWindowMessage(hwnd_, message, w_param, l_param, result))
+ result = DefWindowProc(hwnd_, message, w_param, l_param);
return result;
}