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 <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "chrome/browser/themes/theme_service.h" | 9 #include "chrome/browser/themes/theme_service.h" |
10 #include "chrome/browser/ui/panels/panel.h" | 10 #include "chrome/browser/ui/panels/panel.h" |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 MessageLoopForUI::current()->RemoveObserver(this); | 163 MessageLoopForUI::current()->RemoveObserver(this); |
164 } | 164 } |
165 | 165 |
166 bool PanelBrowserFrameView::MouseWatcher::IsCursorInViewBounds() const { | 166 bool PanelBrowserFrameView::MouseWatcher::IsCursorInViewBounds() const { |
167 gfx::Point cursor_point = gfx::Screen::GetCursorScreenPoint(); | 167 gfx::Point cursor_point = gfx::Screen::GetCursorScreenPoint(); |
168 return view_->browser_view_->GetBounds().Contains(cursor_point.x(), | 168 return view_->browser_view_->GetBounds().Contains(cursor_point.x(), |
169 cursor_point.y()); | 169 cursor_point.y()); |
170 } | 170 } |
171 | 171 |
172 #if defined(OS_WIN) | 172 #if defined(OS_WIN) |
173 void PanelBrowserFrameView::MouseWatcher::WillProcessMessage(const MSG& msg) { | 173 base::EventStatus PanelBrowserFrameView::MouseWatcher::WillProcessEvent( |
| 174 const base::NativeEvent& event) { |
| 175 return base::EVENT_CONTINUE; |
174 } | 176 } |
175 | 177 |
176 void PanelBrowserFrameView::MouseWatcher::DidProcessMessage(const MSG& msg) { | 178 void PanelBrowserFrameView::MouseWatcher::DidProcessEvent( |
177 switch (msg.message) { | 179 const base::NativeEvent& event) { |
| 180 switch (event.message) { |
178 case WM_MOUSEMOVE: | 181 case WM_MOUSEMOVE: |
179 case WM_NCMOUSEMOVE: | 182 case WM_NCMOUSEMOVE: |
180 case WM_MOUSELEAVE: | 183 case WM_MOUSELEAVE: |
181 case WM_NCMOUSELEAVE: | 184 case WM_NCMOUSELEAVE: |
182 HandleGlobalMouseMoveEvent(); | 185 HandleGlobalMouseMoveEvent(); |
183 break; | 186 break; |
184 default: | 187 default: |
185 break; | 188 break; |
186 } | 189 } |
187 } | 190 } |
| 191 #elif defined(TOUCH_UI) || defined(USE_AURA) |
| 192 base::EventStatus PanelBrowserFrameView::MouseWatcher::WillProcessEvent( |
| 193 const base::NativeEvent& event) { |
| 194 return base::EVENT_CONTINUE; |
| 195 } |
| 196 |
| 197 void PanelBrowserFrameView::MouseWatcher::DidProcessEvent( |
| 198 const base::NativeEvent& event) { |
| 199 NOTIMPLEMENTED(); |
| 200 } |
188 #elif defined(TOOLKIT_USES_GTK) | 201 #elif defined(TOOLKIT_USES_GTK) |
189 void PanelBrowserFrameView::MouseWatcher::WillProcessEvent(GdkEvent* event) { | 202 void PanelBrowserFrameView::MouseWatcher::WillProcessEvent(GdkEvent* event) { |
190 } | 203 } |
191 | 204 |
192 void PanelBrowserFrameView::MouseWatcher::DidProcessEvent(GdkEvent* event) { | 205 void PanelBrowserFrameView::MouseWatcher::DidProcessEvent(GdkEvent* event) { |
193 switch (event->type) { | 206 switch (event->type) { |
194 case GDK_MOTION_NOTIFY: | 207 case GDK_MOTION_NOTIFY: |
195 case GDK_LEAVE_NOTIFY: | 208 case GDK_LEAVE_NOTIFY: |
196 HandleGlobalMouseMoveEvent(); | 209 HandleGlobalMouseMoveEvent(); |
197 break; | 210 break; |
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
729 | 742 |
730 settings_menu_model_.reset( | 743 settings_menu_model_.reset( |
731 new PanelSettingsMenuModel(browser_view_->panel())); | 744 new PanelSettingsMenuModel(browser_view_->panel())); |
732 settings_menu_adapter_.reset( | 745 settings_menu_adapter_.reset( |
733 new views::MenuModelAdapter(settings_menu_model_.get())); | 746 new views::MenuModelAdapter(settings_menu_model_.get())); |
734 settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get()); | 747 settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get()); |
735 settings_menu_adapter_->BuildMenu(settings_menu_); | 748 settings_menu_adapter_->BuildMenu(settings_menu_); |
736 settings_menu_runner_.reset(new views::MenuRunner(settings_menu_)); | 749 settings_menu_runner_.reset(new views::MenuRunner(settings_menu_)); |
737 return true; | 750 return true; |
738 } | 751 } |
OLD | NEW |