Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5968)

Unified Diff: chrome/browser/tab_contents/web_contents_view_win.cc

Issue 19632: Make WebContentsView portable by using the native view types. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/tab_contents/web_contents_view_win.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tab_contents/web_contents_view_win.cc
===================================================================
--- chrome/browser/tab_contents/web_contents_view_win.cc (revision 8803)
+++ chrome/browser/tab_contents/web_contents_view_win.cc (working copy)
@@ -73,11 +73,11 @@
return view;
}
-HWND WebContentsViewWin::GetContainerHWND() const {
+gfx::NativeView WebContentsViewWin::GetNativeView() const {
return GetHWND();
}
-HWND WebContentsViewWin::GetContentHWND() const {
+gfx::NativeView WebContentsViewWin::GetContentNativeView() const {
if (!web_contents_->render_widget_host_view())
return NULL;
return web_contents_->render_widget_host_view()->GetPluginHWND();
@@ -172,9 +172,9 @@
}
void WebContentsViewWin::SetPageTitle(const std::wstring& title) {
- if (GetContainerHWND()) {
+ if (GetNativeView()) {
// It's possible to get this after the hwnd has been destroyed.
- ::SetWindowText(GetContainerHWND(), title.c_str());
+ ::SetWindowText(GetNativeView(), title.c_str());
// TODO(brettw) this call seems messy the way it reaches into the widget
// view, and I'm not sure it's necessary. Maybe we should just remove it.
::SetWindowText(web_contents_->render_widget_host_view()->GetPluginHWND(),
@@ -184,8 +184,8 @@
void WebContentsViewWin::Invalidate() {
// Note that it's possible to get this message after the window was destroyed.
- if (::IsWindow(GetContainerHWND()))
- InvalidateRect(GetContainerHWND(), NULL, FALSE);
+ if (::IsWindow(GetNativeView()))
+ InvalidateRect(GetNativeView(), NULL, FALSE);
}
void WebContentsViewWin::SizeContents(const gfx::Size& size) {
@@ -245,7 +245,7 @@
void WebContentsViewWin::TakeFocus(bool reverse) {
views::FocusManager* focus_manager =
- views::FocusManager::GetFocusManager(GetContainerHWND());
+ views::FocusManager::GetFocusManager(GetNativeView());
// We may not have a focus manager if the tab has been switched before this
// message arrived.
@@ -415,7 +415,7 @@
// This logic should be implemented by RenderWidgetHostHWND (as mentioned
// above) in the ::Init function, which should take a parent and some initial
// bounds.
- widget_host_view_win->Create(GetContainerHWND(), NULL, NULL,
+ widget_host_view_win->Create(GetNativeView(), NULL, NULL,
WS_POPUP, WS_EX_TOOLWINDOW);
widget_host_view_win->MoveWindow(initial_pos.x(), initial_pos.y(),
initial_pos.width(), initial_pos.height(),
@@ -589,8 +589,9 @@
if (!ScrollZoom(scroll_type)) {
// Reflect scroll message to the view() to give it a chance
// to process scrolling.
- SendMessage(GetContentHWND(), message, MAKELONG(scroll_type, position),
- (LPARAM) scrollbar);
+ SendMessage(GetContentNativeView(), message,
+ MAKELONG(scroll_type, position),
+ reinterpret_cast<LPARAM>(scrollbar));
}
}
« no previous file with comments | « chrome/browser/tab_contents/web_contents_view_win.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698