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_bar_view.h" | 5 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <set> | 9 #include <set> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/bind.h" | 12 #include "base/bind.h" |
13 #include "base/i18n/rtl.h" | 13 #include "base/i18n/rtl.h" |
14 #include "base/metrics/histogram.h" | 14 #include "base/metrics/histogram.h" |
15 #include "base/prefs/pref_service.h" | 15 #include "base/prefs/pref_service.h" |
16 #include "base/strings/string_util.h" | 16 #include "base/strings/string_util.h" |
17 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" |
18 #include "chrome/browser/bookmarks/bookmark_model.h" | |
19 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 18 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
20 #include "chrome/browser/browser_process.h" | 19 #include "chrome/browser/browser_process.h" |
21 #include "chrome/browser/chrome_notification_types.h" | 20 #include "chrome/browser/chrome_notification_types.h" |
22 #include "chrome/browser/defaults.h" | 21 #include "chrome/browser/defaults.h" |
23 #include "chrome/browser/profiles/profile.h" | 22 #include "chrome/browser/profiles/profile.h" |
24 #include "chrome/browser/search/search.h" | 23 #include "chrome/browser/search/search.h" |
25 #include "chrome/browser/sync/profile_sync_service.h" | 24 #include "chrome/browser/sync/profile_sync_service.h" |
26 #include "chrome/browser/sync/profile_sync_service_factory.h" | 25 #include "chrome/browser/sync/profile_sync_service_factory.h" |
27 #include "chrome/browser/themes/theme_properties.h" | 26 #include "chrome/browser/themes/theme_properties.h" |
28 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" | 27 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" |
(...skipping 12 matching lines...) Expand all Loading... |
41 #include "chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.h" | 40 #include "chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.h" |
42 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" | 41 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" |
43 #include "chrome/browser/ui/views/event_utils.h" | 42 #include "chrome/browser/ui/views/event_utils.h" |
44 #include "chrome/browser/ui/views/frame/browser_view.h" | 43 #include "chrome/browser/ui/views/frame/browser_view.h" |
45 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 44 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
46 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" | 45 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" |
47 #include "chrome/common/chrome_switches.h" | 46 #include "chrome/common/chrome_switches.h" |
48 #include "chrome/common/extensions/extension_constants.h" | 47 #include "chrome/common/extensions/extension_constants.h" |
49 #include "chrome/common/pref_names.h" | 48 #include "chrome/common/pref_names.h" |
50 #include "chrome/common/url_constants.h" | 49 #include "chrome/common/url_constants.h" |
| 50 #include "components/bookmarks/core/browser/bookmark_model.h" |
51 #include "content/public/browser/notification_details.h" | 51 #include "content/public/browser/notification_details.h" |
52 #include "content/public/browser/notification_source.h" | 52 #include "content/public/browser/notification_source.h" |
53 #include "content/public/browser/page_navigator.h" | 53 #include "content/public/browser/page_navigator.h" |
54 #include "content/public/browser/render_view_host.h" | 54 #include "content/public/browser/render_view_host.h" |
55 #include "content/public/browser/render_widget_host_view.h" | 55 #include "content/public/browser/render_widget_host_view.h" |
56 #include "content/public/browser/user_metrics.h" | 56 #include "content/public/browser/user_metrics.h" |
57 #include "content/public/browser/web_contents.h" | 57 #include "content/public/browser/web_contents.h" |
58 #include "content/public/common/page_transition_types.h" | 58 #include "content/public/common/page_transition_types.h" |
59 #include "extensions/browser/extension_registry.h" | 59 #include "extensions/browser/extension_registry.h" |
60 #include "extensions/common/extension.h" | 60 #include "extensions/common/extension.h" |
(...skipping 1791 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1852 DCHECK(apps_page_shortcut_); | 1852 DCHECK(apps_page_shortcut_); |
1853 // Only perform layout if required. | 1853 // Only perform layout if required. |
1854 bool visible = chrome::ShouldShowAppsShortcutInBookmarkBar( | 1854 bool visible = chrome::ShouldShowAppsShortcutInBookmarkBar( |
1855 browser_->profile(), browser_->host_desktop_type()); | 1855 browser_->profile(), browser_->host_desktop_type()); |
1856 if (apps_page_shortcut_->visible() == visible) | 1856 if (apps_page_shortcut_->visible() == visible) |
1857 return; | 1857 return; |
1858 apps_page_shortcut_->SetVisible(visible); | 1858 apps_page_shortcut_->SetVisible(visible); |
1859 UpdateBookmarksSeparatorVisibility(); | 1859 UpdateBookmarksSeparatorVisibility(); |
1860 Layout(); | 1860 Layout(); |
1861 } | 1861 } |
OLD | NEW |