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_context_menu_controller_vie
ws.h" | 5 #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_vie
ws.h" |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
10 #include "chrome/browser/bookmarks/bookmark_editor.h" | 10 #include "chrome/browser/bookmarks/bookmark_editor.h" |
11 #include "chrome/browser/bookmarks/bookmark_model.h" | 11 #include "chrome/browser/bookmarks/bookmark_model.h" |
12 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 12 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
13 #include "chrome/browser/bookmarks/bookmark_utils.h" | 13 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 14 #include "chrome/browser/instant/search.h" |
14 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 15 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
15 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
16 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" | 17 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" |
17 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
18 #include "chrome/browser/ui/chrome_pages.h" | 19 #include "chrome/browser/ui/chrome_pages.h" |
19 #include "chrome/browser/ui/search/search.h" | |
20 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 20 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
21 #include "chrome/common/pref_names.h" | 21 #include "chrome/common/pref_names.h" |
22 #include "content/public/browser/page_navigator.h" | 22 #include "content/public/browser/page_navigator.h" |
23 #include "content/public/browser/user_metrics.h" | 23 #include "content/public/browser/user_metrics.h" |
24 #include "grit/generated_resources.h" | 24 #include "grit/generated_resources.h" |
25 #include "ui/views/widget/widget.h" | 25 #include "ui/views/widget/widget.h" |
26 | 26 |
27 using content::PageNavigator; | 27 using content::PageNavigator; |
28 using content::UserMetricsAction; | 28 using content::UserMetricsAction; |
29 | 29 |
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
338 void BookmarkContextMenuControllerViews::BookmarkModelChanged() { | 338 void BookmarkContextMenuControllerViews::BookmarkModelChanged() { |
339 delegate_->CloseMenu(); | 339 delegate_->CloseMenu(); |
340 } | 340 } |
341 | 341 |
342 BookmarkModel* BookmarkContextMenuControllerViews::RemoveModelObserver() { | 342 BookmarkModel* BookmarkContextMenuControllerViews::RemoveModelObserver() { |
343 BookmarkModel* model = model_; | 343 BookmarkModel* model = model_; |
344 model_->RemoveObserver(this); | 344 model_->RemoveObserver(this); |
345 model_ = NULL; | 345 model_ = NULL; |
346 return model; | 346 return model; |
347 } | 347 } |
OLD | NEW |