| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/dropdown_bar_host.h" | 5 #include "chrome/browser/ui/views/dropdown_bar_host.h" |
| 6 | 6 |
| 7 #include "chrome/browser/renderer_host/render_view_host.h" | 7 #include "chrome/browser/renderer_host/render_view_host.h" |
| 8 #include "chrome/browser/tab_contents/tab_contents.h" | 8 #include "chrome/browser/tab_contents/tab_contents.h" |
| 9 #include "chrome/browser/tab_contents/tab_contents_view.h" | 9 #include "chrome/browser/tab_contents/tab_contents_view.h" |
| 10 #include "chrome/browser/ui/find_bar/find_bar_controller.h" | 10 #include "chrome/browser/ui/find_bar/find_bar_controller.h" |
| 11 #include "chrome/browser/ui/views/frame/browser_view.h" | 11 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 12 #include "ui/base/keycodes/keyboard_code_conversion_win.h" | 12 #include "ui/base/keycodes/keyboard_code_conversion_win.h" |
| 13 #include "views/controls/scrollbar/native_scroll_bar.h" | 13 #include "views/controls/scrollbar/native_scroll_bar.h" |
| 14 #include "views/widget/widget_win.h" | 14 #include "views/widget/widget_win.h" |
| 15 | 15 |
| 16 NativeWebKeyboardEvent DropdownBarHost::GetKeyboardEvent( | 16 NativeWebKeyboardEvent DropdownBarHost::GetKeyboardEvent( |
| 17 const TabContents* contents, | 17 const TabContents* contents, |
| 18 const views::KeyEvent& key_event) { | 18 const views::KeyEvent& key_event) { |
| 19 HWND hwnd = contents->GetContentNativeView(); | 19 HWND hwnd = contents->GetContentNativeView(); |
| 20 WORD key = WindowsKeyCodeForKeyboardCode(key_event.key_code()); | 20 WORD key = WindowsKeyCodeForKeyboardCode(key_event.key_code()); |
| 21 | 21 |
| 22 return NativeWebKeyboardEvent(hwnd, key_event.message(), key, 0); | 22 return NativeWebKeyboardEvent(hwnd, key_event.native_event().message, key, 0); |
| 23 } | 23 } |
| 24 | 24 |
| 25 views::Widget* DropdownBarHost::CreateHost() { | 25 views::Widget* DropdownBarHost::CreateHost() { |
| 26 views::WidgetWin* widget = new views::WidgetWin(); | 26 views::WidgetWin* widget = new views::WidgetWin(); |
| 27 // Don't let WidgetWin manage our lifetime. We want our lifetime to | 27 // Don't let WidgetWin manage our lifetime. We want our lifetime to |
| 28 // coincide with TabContents. | 28 // coincide with TabContents. |
| 29 widget->set_delete_on_destroy(false); | 29 widget->set_delete_on_destroy(false); |
| 30 widget->set_window_style(WS_CHILD | WS_CLIPCHILDREN); | 30 widget->set_window_style(WS_CHILD | WS_CLIPCHILDREN); |
| 31 widget->set_window_ex_style(WS_EX_TOPMOST); | 31 widget->set_window_ex_style(WS_EX_TOPMOST); |
| 32 | 32 |
| 33 return widget; | 33 return widget; |
| 34 } | 34 } |
| 35 | 35 |
| 36 void DropdownBarHost::SetWidgetPositionNative(const gfx::Rect& new_pos, | 36 void DropdownBarHost::SetWidgetPositionNative(const gfx::Rect& new_pos, |
| 37 bool no_redraw) { | 37 bool no_redraw) { |
| 38 gfx::Rect window_rect; | 38 gfx::Rect window_rect; |
| 39 host_->GetBounds(&window_rect, true); | 39 host_->GetBounds(&window_rect, true); |
| 40 DWORD swp_flags = SWP_NOOWNERZORDER; | 40 DWORD swp_flags = SWP_NOOWNERZORDER; |
| 41 if (!window_rect.IsEmpty()) | 41 if (!window_rect.IsEmpty()) |
| 42 swp_flags |= SWP_NOSIZE; | 42 swp_flags |= SWP_NOSIZE; |
| 43 if (no_redraw) | 43 if (no_redraw) |
| 44 swp_flags |= SWP_NOREDRAW; | 44 swp_flags |= SWP_NOREDRAW; |
| 45 if (!host_->IsVisible()) | 45 if (!host_->IsVisible()) |
| 46 swp_flags |= SWP_SHOWWINDOW; | 46 swp_flags |= SWP_SHOWWINDOW; |
| 47 | 47 |
| 48 ::SetWindowPos(host_->GetNativeView(), HWND_TOP, new_pos.x(), new_pos.y(), | 48 ::SetWindowPos(host_->GetNativeView(), HWND_TOP, new_pos.x(), new_pos.y(), |
| 49 new_pos.width(), new_pos.height(), swp_flags); | 49 new_pos.width(), new_pos.height(), swp_flags); |
| 50 } | 50 } |
| OLD | NEW |