Chromium Code Reviews| 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/panels/panel_browser_frame_view.h" | 5 #include "chrome/browser/ui/panels/panel_browser_frame_view.h" |
| 6 | 6 |
| 7 #include "chrome/browser/themes/theme_service.h" | 7 #include "chrome/browser/themes/theme_service.h" |
| 8 #include "chrome/browser/ui/panels/panel.h" | 8 #include "chrome/browser/ui/panels/panel.h" |
| 9 #include "chrome/browser/ui/panels/panel_browser_view.h" | 9 #include "chrome/browser/ui/panels/panel_browser_view.h" |
| 10 #include "chrome/browser/ui/panels/panel_manager.h" | 10 #include "chrome/browser/ui/panels/panel_manager.h" |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 157 MessageLoopForUI::current()->RemoveObserver(this); | 157 MessageLoopForUI::current()->RemoveObserver(this); |
| 158 } | 158 } |
| 159 | 159 |
| 160 bool PanelBrowserFrameView::MouseWatcher::IsCursorInViewBounds() const { | 160 bool PanelBrowserFrameView::MouseWatcher::IsCursorInViewBounds() const { |
| 161 gfx::Point cursor_point = gfx::Screen::GetCursorScreenPoint(); | 161 gfx::Point cursor_point = gfx::Screen::GetCursorScreenPoint(); |
| 162 return view_->browser_view_->GetBounds().Contains(cursor_point.x(), | 162 return view_->browser_view_->GetBounds().Contains(cursor_point.x(), |
| 163 cursor_point.y()); | 163 cursor_point.y()); |
| 164 } | 164 } |
| 165 | 165 |
| 166 #if defined(OS_WIN) | 166 #if defined(OS_WIN) |
| 167 void PanelBrowserFrameView::MouseWatcher::WillProcessMessage(const MSG& msg) { | 167 base::EventStatus PanelBrowserFrameView::MouseWatcher::WillProcessEvent( |
| 168 const base::NativeEvent& event) { | |
| 169 return base::EVENT_CONTINUE; | |
| 168 } | 170 } |
| 169 | 171 |
| 170 void PanelBrowserFrameView::MouseWatcher::DidProcessMessage(const MSG& msg) { | 172 void PanelBrowserFrameView::MouseWatcher::DidProcessEvent(const MSG& msg) { |
|
msw
2011/09/27 01:16:46
type/name, although it looks tough to merge signat
oshima
2011/09/27 02:12:12
Done.
| |
| 171 switch (msg.message) { | 173 switch (msg.message) { |
| 172 case WM_MOUSEMOVE: | 174 case WM_MOUSEMOVE: |
| 173 case WM_NCMOUSEMOVE: | 175 case WM_NCMOUSEMOVE: |
| 174 case WM_MOUSELEAVE: | 176 case WM_MOUSELEAVE: |
| 175 case WM_NCMOUSELEAVE: | 177 case WM_NCMOUSELEAVE: |
| 176 HandleGlobalMouseMoveEvent(); | 178 HandleGlobalMouseMoveEvent(); |
| 177 break; | 179 break; |
| 178 default: | 180 default: |
| 179 break; | 181 break; |
| 180 } | 182 } |
| 181 } | 183 } |
| 184 #elif defined(TOUCH_UI) || defined(USE_AURA) | |
| 185 base::EventStatus PanelBrowserFrameView::MouseWatcher::WillProcessEvent( | |
| 186 const base::NativeEvent& event) { | |
| 187 return base::EVENT_CONTINUE; | |
| 188 } | |
| 189 | |
| 190 void PanelBrowserFrameView::MouseWatcher::DidProcessEvent( | |
| 191 const base::NativeEvent& event) { | |
| 192 NOTIMPLEMENTED(); | |
| 193 } | |
| 182 #elif defined(TOOLKIT_USES_GTK) | 194 #elif defined(TOOLKIT_USES_GTK) |
| 183 void PanelBrowserFrameView::MouseWatcher::WillProcessEvent(GdkEvent* event) { | 195 void PanelBrowserFrameView::MouseWatcher::WillProcessEvent(GdkEvent* event) { |
| 184 } | 196 } |
| 185 | 197 |
| 186 void PanelBrowserFrameView::MouseWatcher::DidProcessEvent(GdkEvent* event) { | 198 void PanelBrowserFrameView::MouseWatcher::DidProcessEvent(GdkEvent* event) { |
| 187 switch (event->type) { | 199 switch (event->type) { |
| 188 case GDK_MOTION_NOTIFY: | 200 case GDK_MOTION_NOTIFY: |
| 189 case GDK_LEAVE_NOTIFY: | 201 case GDK_LEAVE_NOTIFY: |
| 190 HandleGlobalMouseMoveEvent(); | 202 HandleGlobalMouseMoveEvent(); |
| 191 break; | 203 break; |
| (...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 662 | 674 |
| 663 settings_menu_model_.reset( | 675 settings_menu_model_.reset( |
| 664 new PanelSettingsMenuModel(browser_view_->panel())); | 676 new PanelSettingsMenuModel(browser_view_->panel())); |
| 665 settings_menu_adapter_.reset( | 677 settings_menu_adapter_.reset( |
| 666 new views::MenuModelAdapter(settings_menu_model_.get())); | 678 new views::MenuModelAdapter(settings_menu_model_.get())); |
| 667 settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get()); | 679 settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get()); |
| 668 settings_menu_adapter_->BuildMenu(settings_menu_); | 680 settings_menu_adapter_->BuildMenu(settings_menu_); |
| 669 settings_menu_runner_.reset(new views::MenuRunner(settings_menu_)); | 681 settings_menu_runner_.reset(new views::MenuRunner(settings_menu_)); |
| 670 return true; | 682 return true; |
| 671 } | 683 } |
| OLD | NEW |