OLD | NEW |
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/views/bookmarks/bookmark_menu_delegate.h" | 5 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h" |
6 | 6 |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "chrome/browser/bookmarks/bookmark_model.h" | 8 #include "chrome/browser/bookmarks/bookmark_model.h" |
9 #include "chrome/browser/bookmarks/bookmark_node_data.h" | 9 #include "chrome/browser/bookmarks/bookmark_node_data.h" |
10 #include "chrome/browser/bookmarks/bookmark_utils.h" | 10 #include "chrome/browser/bookmarks/bookmark_utils.h" |
(...skipping 27 matching lines...) Expand all Loading... |
38 views::Widget* parent, | 38 views::Widget* parent, |
39 int first_menu_id) | 39 int first_menu_id) |
40 : profile_(profile), | 40 : profile_(profile), |
41 page_navigator_(navigator), | 41 page_navigator_(navigator), |
42 parent_(parent), | 42 parent_(parent), |
43 menu_(NULL), | 43 menu_(NULL), |
44 for_drop_(false), | 44 for_drop_(false), |
45 parent_menu_item_(NULL), | 45 parent_menu_item_(NULL), |
46 next_menu_id_(first_menu_id), | 46 next_menu_id_(first_menu_id), |
47 real_delegate_(NULL), | 47 real_delegate_(NULL), |
48 is_mutating_model_(false) { | 48 is_mutating_model_(false), |
| 49 location_(bookmark_utils::LAUNCH_NONE){ |
49 } | 50 } |
50 | 51 |
51 BookmarkMenuDelegate::~BookmarkMenuDelegate() { | 52 BookmarkMenuDelegate::~BookmarkMenuDelegate() { |
52 profile_->GetBookmarkModel()->RemoveObserver(this); | 53 profile_->GetBookmarkModel()->RemoveObserver(this); |
53 } | 54 } |
54 | 55 |
55 void BookmarkMenuDelegate::Init( | 56 void BookmarkMenuDelegate::Init( |
56 views::MenuDelegate* real_delegate, | 57 views::MenuDelegate* real_delegate, |
57 MenuItemView* parent, | 58 MenuItemView* parent, |
58 const BookmarkNode* node, | 59 const BookmarkNode* node, |
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
476 MenuItemView* BookmarkMenuDelegate::GetMenuByID(int id) { | 477 MenuItemView* BookmarkMenuDelegate::GetMenuByID(int id) { |
477 for (NodeToMenuMap::const_iterator i = node_to_menu_map_.begin(); | 478 for (NodeToMenuMap::const_iterator i = node_to_menu_map_.begin(); |
478 i != node_to_menu_map_.end(); ++i) { | 479 i != node_to_menu_map_.end(); ++i) { |
479 MenuItemView* menu = i->second->GetMenuItemByID(id); | 480 MenuItemView* menu = i->second->GetMenuItemByID(id); |
480 if (menu) | 481 if (menu) |
481 return menu; | 482 return menu; |
482 } | 483 } |
483 | 484 |
484 return parent_menu_item_ ? parent_menu_item_->GetMenuItemByID(id) : NULL; | 485 return parent_menu_item_ ? parent_menu_item_->GetMenuItemByID(id) : NULL; |
485 } | 486 } |
OLD | NEW |