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/wrench_menu.h" | 5 #include "chrome/browser/ui/views/wrench_menu.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <set> | 9 #include <set> |
10 | 10 |
11 #include "base/strings/string_number_conversions.h" | 11 #include "base/strings/string_number_conversions.h" |
12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
13 #include "chrome/app/chrome_command_ids.h" | 13 #include "chrome/app/chrome_command_ids.h" |
14 #include "chrome/browser/bookmarks/bookmark_model.h" | 14 #include "chrome/browser/bookmarks/bookmark_model.h" |
15 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 15 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 16 #include "chrome/browser/instant/search.h" |
16 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
17 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
18 #include "chrome/browser/ui/browser_window.h" | 19 #include "chrome/browser/ui/browser_window.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/browser/ui/views/bookmarks/bookmark_menu_delegate.h" | 21 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h" |
22 #include "chrome/common/chrome_notification_types.h" | 22 #include "chrome/common/chrome_notification_types.h" |
23 #include "content/public/browser/host_zoom_map.h" | 23 #include "content/public/browser/host_zoom_map.h" |
24 #include "content/public/browser/notification_observer.h" | 24 #include "content/public/browser/notification_observer.h" |
25 #include "content/public/browser/notification_registrar.h" | 25 #include "content/public/browser/notification_registrar.h" |
26 #include "content/public/browser/notification_source.h" | 26 #include "content/public/browser/notification_source.h" |
27 #include "content/public/browser/notification_types.h" | 27 #include "content/public/browser/notification_types.h" |
28 #include "content/public/browser/user_metrics.h" | 28 #include "content/public/browser/user_metrics.h" |
29 #include "content/public/browser/web_contents.h" | 29 #include "content/public/browser/web_contents.h" |
(...skipping 1116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1146 bookmark_menu_delegate_.reset( | 1146 bookmark_menu_delegate_.reset( |
1147 new BookmarkMenuDelegate(browser_, | 1147 new BookmarkMenuDelegate(browser_, |
1148 browser_, | 1148 browser_, |
1149 parent, | 1149 parent, |
1150 first_bookmark_command_id_)); | 1150 first_bookmark_command_id_)); |
1151 bookmark_menu_delegate_->Init( | 1151 bookmark_menu_delegate_->Init( |
1152 this, bookmark_menu_, model->bookmark_bar_node(), 0, | 1152 this, bookmark_menu_, model->bookmark_bar_node(), 0, |
1153 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS, | 1153 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS, |
1154 bookmark_utils::LAUNCH_WRENCH_MENU); | 1154 bookmark_utils::LAUNCH_WRENCH_MENU); |
1155 } | 1155 } |
OLD | NEW |