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

Side by Side Diff: chrome/browser/chromeos/views/native_menu_domui.h

Issue 5110011: A non-GTK version of menus for touchui. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fix compile for touch on chromeos Created 10 years 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
« no previous file with comments | « base/message_pump_glib_x_dispatch.h ('k') | chrome/browser/chromeos/views/native_menu_domui.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_CHROMEOS_VIEWS_NATIVE_MENU_DOMUI_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_VIEWS_NATIVE_MENU_DOMUI_H_
6 #define CHROME_BROWSER_CHROMEOS_VIEWS_NATIVE_MENU_DOMUI_H_ 6 #define CHROME_BROWSER_CHROMEOS_VIEWS_NATIVE_MENU_DOMUI_H_
7 #pragma once 7 #pragma once
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 virtual void UpdateStates(); 57 virtual void UpdateStates();
58 virtual gfx::NativeMenu GetNativeMenu() const; 58 virtual gfx::NativeMenu GetNativeMenu() const;
59 virtual MenuAction GetMenuAction() const; 59 virtual MenuAction GetMenuAction() const;
60 virtual void AddMenuListener(views::MenuListener* listener); 60 virtual void AddMenuListener(views::MenuListener* listener);
61 virtual void RemoveMenuListener(views::MenuListener* listener); 61 virtual void RemoveMenuListener(views::MenuListener* listener);
62 virtual void SetMinimumWidth(int width); 62 virtual void SetMinimumWidth(int width);
63 63
64 // Overriden from MessageLoopForUI::Dispatcher: 64 // Overriden from MessageLoopForUI::Dispatcher:
65 virtual bool Dispatch(GdkEvent* event); 65 virtual bool Dispatch(GdkEvent* event);
66 #if defined(TOUCH_UI) 66 #if defined(TOUCH_UI)
67 virtual bool Dispatch(XEvent* xevent); 67 virtual base::MessagePumpGlibXDispatcher::DispatchStatus Dispatch(
68 XEvent* xevent);
68 #endif 69 #endif
69 70
70 // Overriden from DOMUIMenuControl; 71 // Overriden from DOMUIMenuControl;
71 virtual menus::MenuModel* GetMenuModel() { return model_; } 72 virtual menus::MenuModel* GetMenuModel() { return model_; }
72 virtual void Activate(menus::MenuModel* model, 73 virtual void Activate(menus::MenuModel* model,
73 int index, 74 int index,
74 ActivationMode activation_mode); 75 ActivationMode activation_mode);
75 virtual void CloseAll(); 76 virtual void CloseAll();
76 virtual void CloseSubmenu(); 77 virtual void CloseSubmenu();
77 virtual void MoveInputToParent(); 78 virtual void MoveInputToParent();
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 // This is to deal with the menu being deleted while the nested 157 // This is to deal with the menu being deleted while the nested
157 // message loop is handled. see http://crosbug.com/7929 . 158 // message loop is handled. see http://crosbug.com/7929 .
158 views::NestedDispatcherGtk* nested_dispatcher_; 159 views::NestedDispatcherGtk* nested_dispatcher_;
159 160
160 DISALLOW_COPY_AND_ASSIGN(NativeMenuDOMUI); 161 DISALLOW_COPY_AND_ASSIGN(NativeMenuDOMUI);
161 }; 162 };
162 163
163 } // namespace chromeos 164 } // namespace chromeos
164 165
165 #endif // CHROME_BROWSER_CHROMEOS_VIEWS_NATIVE_MENU_DOMUI_H_ 166 #endif // CHROME_BROWSER_CHROMEOS_VIEWS_NATIVE_MENU_DOMUI_H_
OLDNEW
« no previous file with comments | « base/message_pump_glib_x_dispatch.h ('k') | chrome/browser/chromeos/views/native_menu_domui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698