| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_controller_views.h" | 5 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" |
| 6 | 6 |
| 7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "base/stl_util.h" | 8 #include "base/stl_util.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 using content::PageNavigator; | 27 using content::PageNavigator; |
| 28 using content::UserMetricsAction; | 28 using content::UserMetricsAction; |
| 29 using views::MenuItemView; | 29 using views::MenuItemView; |
| 30 | 30 |
| 31 BookmarkMenuController::BookmarkMenuController(Browser* browser, | 31 BookmarkMenuController::BookmarkMenuController(Browser* browser, |
| 32 PageNavigator* page_navigator, | 32 PageNavigator* page_navigator, |
| 33 views::Widget* parent, | 33 views::Widget* parent, |
| 34 const BookmarkNode* node, | 34 const BookmarkNode* node, |
| 35 int start_child_index) | 35 int start_child_index) |
| 36 : menu_delegate_( | 36 : menu_delegate_( |
| 37 new BookmarkMenuDelegate(browser, page_navigator, parent, 1)), | 37 new BookmarkMenuDelegate(browser, page_navigator, parent, 1, |
| 38 kint32max)), |
| 38 node_(node), | 39 node_(node), |
| 39 observer_(NULL), | 40 observer_(NULL), |
| 40 for_drop_(false), | 41 for_drop_(false), |
| 41 bookmark_bar_(NULL) { | 42 bookmark_bar_(NULL) { |
| 42 menu_delegate_->Init(this, NULL, node, start_child_index, | 43 menu_delegate_->Init(this, NULL, node, start_child_index, |
| 43 BookmarkMenuDelegate::HIDE_PERMANENT_FOLDERS, | 44 BookmarkMenuDelegate::HIDE_PERMANENT_FOLDERS, |
| 44 BOOKMARK_LAUNCH_LOCATION_BAR_SUBFOLDER); | 45 BOOKMARK_LAUNCH_LOCATION_BAR_SUBFOLDER); |
| 45 menu_runner_.reset(new views::MenuRunner(menu_delegate_->menu())); | 46 menu_runner_.reset(new views::MenuRunner(menu_delegate_->menu())); |
| 46 } | 47 } |
| 47 | 48 |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 void BookmarkMenuController::BookmarkModelChanged() { | 190 void BookmarkMenuController::BookmarkModelChanged() { |
| 190 if (!menu_delegate_->is_mutating_model()) | 191 if (!menu_delegate_->is_mutating_model()) |
| 191 menu()->Cancel(); | 192 menu()->Cancel(); |
| 192 } | 193 } |
| 193 | 194 |
| 194 BookmarkMenuController::~BookmarkMenuController() { | 195 BookmarkMenuController::~BookmarkMenuController() { |
| 195 menu_delegate_->GetBookmarkModel()->RemoveObserver(this); | 196 menu_delegate_->GetBookmarkModel()->RemoveObserver(this); |
| 196 if (observer_) | 197 if (observer_) |
| 197 observer_->BookmarkMenuControllerDeleted(this); | 198 observer_->BookmarkMenuControllerDeleted(this); |
| 198 } | 199 } |
| OLD | NEW |