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

Side by Side Diff: chrome/browser/ui/panels/panel_browser_frame_view.cc

Issue 8021009: Consolidate message observer API for win and aura (and touch). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed msw's comments Created 9 years, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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(
173 const base::NativeEvent& event) {
171 switch (msg.message) { 174 switch (msg.message) {
172 case WM_MOUSEMOVE: 175 case WM_MOUSEMOVE:
173 case WM_NCMOUSEMOVE: 176 case WM_NCMOUSEMOVE:
174 case WM_MOUSELEAVE: 177 case WM_MOUSELEAVE:
175 case WM_NCMOUSELEAVE: 178 case WM_NCMOUSELEAVE:
176 HandleGlobalMouseMoveEvent(); 179 HandleGlobalMouseMoveEvent();
177 break; 180 break;
178 default: 181 default:
179 break; 182 break;
180 } 183 }
181 } 184 }
185 #elif defined(TOUCH_UI) || defined(USE_AURA)
186 base::EventStatus PanelBrowserFrameView::MouseWatcher::WillProcessEvent(
187 const base::NativeEvent& event) {
188 return base::EVENT_CONTINUE;
189 }
190
191 void PanelBrowserFrameView::MouseWatcher::DidProcessEvent(
192 const base::NativeEvent& event) {
193 NOTIMPLEMENTED();
194 }
182 #elif defined(TOOLKIT_USES_GTK) 195 #elif defined(TOOLKIT_USES_GTK)
183 void PanelBrowserFrameView::MouseWatcher::WillProcessEvent(GdkEvent* event) { 196 void PanelBrowserFrameView::MouseWatcher::WillProcessEvent(GdkEvent* event) {
184 } 197 }
185 198
186 void PanelBrowserFrameView::MouseWatcher::DidProcessEvent(GdkEvent* event) { 199 void PanelBrowserFrameView::MouseWatcher::DidProcessEvent(GdkEvent* event) {
187 switch (event->type) { 200 switch (event->type) {
188 case GDK_MOTION_NOTIFY: 201 case GDK_MOTION_NOTIFY:
189 case GDK_LEAVE_NOTIFY: 202 case GDK_LEAVE_NOTIFY:
190 HandleGlobalMouseMoveEvent(); 203 HandleGlobalMouseMoveEvent();
191 break; 204 break;
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 675
663 settings_menu_model_.reset( 676 settings_menu_model_.reset(
664 new PanelSettingsMenuModel(browser_view_->panel())); 677 new PanelSettingsMenuModel(browser_view_->panel()));
665 settings_menu_adapter_.reset( 678 settings_menu_adapter_.reset(
666 new views::MenuModelAdapter(settings_menu_model_.get())); 679 new views::MenuModelAdapter(settings_menu_model_.get()));
667 settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get()); 680 settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get());
668 settings_menu_adapter_->BuildMenu(settings_menu_); 681 settings_menu_adapter_->BuildMenu(settings_menu_);
669 settings_menu_runner_.reset(new views::MenuRunner(settings_menu_)); 682 settings_menu_runner_.reset(new views::MenuRunner(settings_menu_));
670 return true; 683 return true;
671 } 684 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698