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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h

Issue 7066034: Fixes couple of issues with bookmarks in wrench menu: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.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) 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_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_
6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_ 6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 167
168 // Data for the drop. 168 // Data for the drop.
169 BookmarkNodeData drop_data_; 169 BookmarkNodeData drop_data_;
170 170
171 // Used when a context menu is shown. 171 // Used when a context menu is shown.
172 scoped_ptr<BookmarkContextMenu> context_menu_; 172 scoped_ptr<BookmarkContextMenu> context_menu_;
173 173
174 // Is the menu being shown for a drop? 174 // Is the menu being shown for a drop?
175 bool for_drop_; 175 bool for_drop_;
176 176
177 // If non-null this is the |parent| passed to Init and is NOT owned by us.
Ben Goodger (Google) 2011/05/24 22:31:34 non-NULL
178 views::MenuItemView* parent_menu_item_;
179
180 // Maps from node to menu. This is used if a NULL parent is passed to Init().
177 NodeToMenuMap node_to_menu_map_; 181 NodeToMenuMap node_to_menu_map_;
178 182
179 // ID of the next menu item. 183 // ID of the next menu item.
180 int next_menu_id_; 184 int next_menu_id_;
181 185
182 views::MenuDelegate* real_delegate_; 186 views::MenuDelegate* real_delegate_;
183 187
184 // Is the model being changed? 188 // Is the model being changed?
185 bool is_mutating_model_; 189 bool is_mutating_model_;
186 190
187 DISALLOW_COPY_AND_ASSIGN(BookmarkMenuDelegate); 191 DISALLOW_COPY_AND_ASSIGN(BookmarkMenuDelegate);
188 }; 192 };
189 193
190 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_ 194 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698