| 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_controller_views.h" | 5 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" |
| 6 | 6 |
| 7 #include "base/stl_util.h" | 7 #include "base/stl_util.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "chrome/browser/bookmarks/bookmark_model.h" | 9 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_node_data.h" | 10 #include "chrome/browser/bookmarks/bookmark_node_data.h" |
| 11 #include "chrome/browser/bookmarks/bookmark_utils.h" | 11 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 12 #include "chrome/browser/prefs/pref_service.h" | 12 #include "chrome/browser/prefs/pref_service.h" |
| 13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 14 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" | 14 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
| 15 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h" | 15 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h" |
| 16 #include "chrome/browser/ui/views/event_utils.h" | 16 #include "chrome/browser/ui/views/event_utils.h" |
| 17 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
| 18 #include "content/browser/tab_contents/page_navigator.h" | 18 #include "content/browser/tab_contents/page_navigator.h" |
| 19 #include "content/browser/user_metrics.h" | 19 #include "content/browser/user_metrics.h" |
| 20 #include "content/common/page_transition_types.h" | |
| 21 #include "grit/generated_resources.h" | 20 #include "grit/generated_resources.h" |
| 22 #include "grit/theme_resources.h" | 21 #include "grit/theme_resources.h" |
| 23 #include "grit/ui_resources.h" | 22 #include "grit/ui_resources.h" |
| 24 #include "ui/base/dragdrop/os_exchange_data.h" | 23 #include "ui/base/dragdrop/os_exchange_data.h" |
| 25 #include "ui/base/resource/resource_bundle.h" | 24 #include "ui/base/resource/resource_bundle.h" |
| 26 #include "views/controls/button/menu_button.h" | 25 #include "views/controls/button/menu_button.h" |
| 27 #include "views/controls/menu/menu_runner.h" | 26 #include "views/controls/menu/menu_runner.h" |
| 28 #include "views/widget/widget.h" | 27 #include "views/widget/widget.h" |
| 29 | 28 |
| 30 using views::MenuItemView; | 29 using views::MenuItemView; |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 void BookmarkMenuController::BookmarkModelChanged() { | 181 void BookmarkMenuController::BookmarkModelChanged() { |
| 183 if (!menu_delegate_->is_mutating_model()) | 182 if (!menu_delegate_->is_mutating_model()) |
| 184 menu()->Cancel(); | 183 menu()->Cancel(); |
| 185 } | 184 } |
| 186 | 185 |
| 187 BookmarkMenuController::~BookmarkMenuController() { | 186 BookmarkMenuController::~BookmarkMenuController() { |
| 188 menu_delegate_->profile()->GetBookmarkModel()->RemoveObserver(this); | 187 menu_delegate_->profile()->GetBookmarkModel()->RemoveObserver(this); |
| 189 if (observer_) | 188 if (observer_) |
| 190 observer_->BookmarkMenuDeleted(this); | 189 observer_->BookmarkMenuDeleted(this); |
| 191 } | 190 } |
| OLD | NEW |