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

Side by Side Diff: chrome/browser/ui/views/wrench_menu.h

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 9 years, 1 month 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
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_VIEWS_WRENCH_MENU_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_WRENCH_MENU_H_
6 #define CHROME_BROWSER_UI_VIEWS_WRENCH_MENU_H_ 6 #define CHROME_BROWSER_UI_VIEWS_WRENCH_MENU_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <utility> 10 #include <utility>
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 const gfx::Point& p, 61 const gfx::Point& p,
62 bool is_mouse_gesture) OVERRIDE; 62 bool is_mouse_gesture) OVERRIDE;
63 virtual bool CanDrag(views::MenuItemView* menu) OVERRIDE; 63 virtual bool CanDrag(views::MenuItemView* menu) OVERRIDE;
64 virtual void WriteDragData(views::MenuItemView* sender, 64 virtual void WriteDragData(views::MenuItemView* sender,
65 ui::OSExchangeData* data) OVERRIDE; 65 ui::OSExchangeData* data) OVERRIDE;
66 virtual int GetDragOperations(views::MenuItemView* sender) OVERRIDE; 66 virtual int GetDragOperations(views::MenuItemView* sender) OVERRIDE;
67 virtual int GetMaxWidthForMenu(views::MenuItemView* menu) OVERRIDE; 67 virtual int GetMaxWidthForMenu(views::MenuItemView* menu) OVERRIDE;
68 virtual bool IsItemChecked(int id) const OVERRIDE; 68 virtual bool IsItemChecked(int id) const OVERRIDE;
69 virtual bool IsCommandEnabled(int id) const OVERRIDE; 69 virtual bool IsCommandEnabled(int id) const OVERRIDE;
70 virtual void ExecuteCommand(int id, int mouse_event_flags) OVERRIDE; 70 virtual void ExecuteCommand(int id, int mouse_event_flags) OVERRIDE;
71 virtual bool GetAccelerator(int id, views::Accelerator* accelerator) OVERRIDE; 71 virtual bool GetAccelerator(int id, ui::Accelerator* accelerator) OVERRIDE;
72 virtual void WillShowMenu(views::MenuItemView* menu) OVERRIDE; 72 virtual void WillShowMenu(views::MenuItemView* menu) OVERRIDE;
73 73
74 // BaseBookmarkModelObserver overrides: 74 // BaseBookmarkModelObserver overrides:
75 virtual void BookmarkModelChanged() OVERRIDE; 75 virtual void BookmarkModelChanged() OVERRIDE;
76 76
77 // content::NotificationObserver overrides: 77 // content::NotificationObserver overrides:
78 virtual void Observe(int type, 78 virtual void Observe(int type,
79 const content::NotificationSource& source, 79 const content::NotificationSource& source,
80 const content::NotificationDetails& details) OVERRIDE; 80 const content::NotificationDetails& details) OVERRIDE;
81 81
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 141
142 // ID to use for the items representing bookmarks in the bookmark menu. 142 // ID to use for the items representing bookmarks in the bookmark menu.
143 int first_bookmark_command_id_; 143 int first_bookmark_command_id_;
144 144
145 content::NotificationRegistrar registrar_; 145 content::NotificationRegistrar registrar_;
146 146
147 DISALLOW_COPY_AND_ASSIGN(WrenchMenu); 147 DISALLOW_COPY_AND_ASSIGN(WrenchMenu);
148 }; 148 };
149 149
150 #endif // CHROME_BROWSER_UI_VIEWS_WRENCH_MENU_H_ 150 #endif // CHROME_BROWSER_UI_VIEWS_WRENCH_MENU_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/unhandled_keyboard_event_handler.cc ('k') | chrome/browser/ui/views/wrench_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698