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

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

Issue 8021009: Consolidate message observer API for win and aura (and touch). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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 #ifndef CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_
6 #define CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_ 6 #define CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/gtest_prod_util.h" 9 #include "base/gtest_prod_util.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 PAINT_FOR_ATTENTION 100 PAINT_FOR_ATTENTION
101 }; 101 };
102 102
103 class MouseWatcher : public MessageLoopForUI::Observer { 103 class MouseWatcher : public MessageLoopForUI::Observer {
104 public: 104 public:
105 explicit MouseWatcher(PanelBrowserFrameView* view); 105 explicit MouseWatcher(PanelBrowserFrameView* view);
106 virtual ~MouseWatcher(); 106 virtual ~MouseWatcher();
107 107
108 virtual bool IsCursorInViewBounds() const; 108 virtual bool IsCursorInViewBounds() const;
109 109
110 #if defined(OS_WIN) 110 #if defined(OS_WIN) || defined(TOUCH_UI) || defined(USE_AURA)
111 virtual void WillProcessMessage(const MSG& msg) OVERRIDE { } 111 virtual base::EventStatus WillProcessEvent(
112 virtual void DidProcessMessage(const MSG& msg) OVERRIDE; 112 const base::NativeEvent& event) OVERRIDE {
113 #else 113 return base::EVENT_CONTINUE;
114 }
115 virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE;
116 #elif defined(TOOLKIT_USES_GTK)
114 virtual void WillProcessEvent(GdkEvent* event) OVERRIDE { } 117 virtual void WillProcessEvent(GdkEvent* event) OVERRIDE { }
115 virtual void DidProcessEvent(GdkEvent* event) OVERRIDE; 118 virtual void DidProcessEvent(GdkEvent* event) OVERRIDE;
116 #endif 119 #endif
117 120
118 private: 121 private:
119 void HandleGlobalMouseMoveEvent(); 122 void HandleGlobalMouseMoveEvent();
120 123
121 PanelBrowserFrameView* view_; 124 PanelBrowserFrameView* view_;
122 bool is_mouse_within_; 125 bool is_mouse_within_;
123 126
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 scoped_ptr<PanelSettingsMenuModel> settings_menu_model_; 185 scoped_ptr<PanelSettingsMenuModel> settings_menu_model_;
183 scoped_ptr<views::MenuModelAdapter> settings_menu_adapter_; 186 scoped_ptr<views::MenuModelAdapter> settings_menu_adapter_;
184 views::MenuItemView* settings_menu_; // Owned by |settings_menu_runner_|. 187 views::MenuItemView* settings_menu_; // Owned by |settings_menu_runner_|.
185 scoped_ptr<views::MenuRunner> settings_menu_runner_; 188 scoped_ptr<views::MenuRunner> settings_menu_runner_;
186 scoped_ptr<ExtensionUninstallDialog> extension_uninstall_dialog_; 189 scoped_ptr<ExtensionUninstallDialog> extension_uninstall_dialog_;
187 190
188 DISALLOW_COPY_AND_ASSIGN(PanelBrowserFrameView); 191 DISALLOW_COPY_AND_ASSIGN(PanelBrowserFrameView);
189 }; 192 };
190 193
191 #endif // CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_ 194 #endif // CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698