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 <string> | 9 #include <string> |
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_factory.h" | 18 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
19 #include "chrome/browser/bookmarks/chrome_bookmark_client.h" | 19 #include "chrome/browser/bookmarks/chrome_bookmark_client.h" |
20 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h" | 20 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h" |
21 #include "chrome/browser/browser_process.h" | 21 #include "chrome/browser/browser_process.h" |
22 #include "chrome/browser/chrome_notification_types.h" | 22 #include "chrome/browser/chrome_notification_types.h" |
23 #include "chrome/browser/defaults.h" | 23 #include "chrome/browser/defaults.h" |
| 24 #include "chrome/browser/metrics/metrics_services_manager.h" |
24 #include "chrome/browser/profiles/profile.h" | 25 #include "chrome/browser/profiles/profile.h" |
25 #include "chrome/browser/search/search.h" | 26 #include "chrome/browser/search/search.h" |
26 #include "chrome/browser/sync/profile_sync_service.h" | 27 #include "chrome/browser/sync/profile_sync_service.h" |
27 #include "chrome/browser/sync/profile_sync_service_factory.h" | 28 #include "chrome/browser/sync/profile_sync_service_factory.h" |
28 #include "chrome/browser/themes/theme_properties.h" | 29 #include "chrome/browser/themes/theme_properties.h" |
29 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" | 30 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" |
30 #include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h" | 31 #include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h" |
31 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" | 32 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" |
32 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" | 33 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" |
33 #include "chrome/browser/ui/browser.h" | 34 #include "chrome/browser/ui/browser.h" |
34 #include "chrome/browser/ui/chrome_pages.h" | 35 #include "chrome/browser/ui/chrome_pages.h" |
35 #include "chrome/browser/ui/elide_url.h" | 36 #include "chrome/browser/ui/elide_url.h" |
36 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" | 37 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" |
37 #include "chrome/browser/ui/omnibox/omnibox_view.h" | 38 #include "chrome/browser/ui/omnibox/omnibox_view.h" |
38 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 39 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
39 #include "chrome/browser/ui/view_ids.h" | 40 #include "chrome/browser/ui/view_ids.h" |
40 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h" | 41 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h" |
41 #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h" | 42 #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h" |
42 #include "chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.h" | 43 #include "chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.h" |
43 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" | 44 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" |
44 #include "chrome/browser/ui/views/event_utils.h" | 45 #include "chrome/browser/ui/views/event_utils.h" |
45 #include "chrome/browser/ui/views/frame/browser_view.h" | 46 #include "chrome/browser/ui/views/frame/browser_view.h" |
46 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 47 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
47 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" | 48 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" |
48 #include "chrome/common/chrome_switches.h" | 49 #include "chrome/common/chrome_switches.h" |
49 #include "chrome/common/extensions/extension_constants.h" | 50 #include "chrome/common/extensions/extension_constants.h" |
50 #include "chrome/common/pref_names.h" | 51 #include "chrome/common/pref_names.h" |
51 #include "chrome/common/url_constants.h" | 52 #include "chrome/common/url_constants.h" |
52 #include "components/bookmarks/browser/bookmark_model.h" | 53 #include "components/bookmarks/browser/bookmark_model.h" |
| 54 #include "components/metrics/metrics_service.h" |
53 #include "content/public/browser/notification_details.h" | 55 #include "content/public/browser/notification_details.h" |
54 #include "content/public/browser/notification_source.h" | 56 #include "content/public/browser/notification_source.h" |
55 #include "content/public/browser/page_navigator.h" | 57 #include "content/public/browser/page_navigator.h" |
56 #include "content/public/browser/render_view_host.h" | 58 #include "content/public/browser/render_view_host.h" |
57 #include "content/public/browser/render_widget_host_view.h" | 59 #include "content/public/browser/render_widget_host_view.h" |
58 #include "content/public/browser/user_metrics.h" | 60 #include "content/public/browser/user_metrics.h" |
59 #include "content/public/browser/web_contents.h" | 61 #include "content/public/browser/web_contents.h" |
60 #include "content/public/common/page_transition_types.h" | 62 #include "content/public/common/page_transition_types.h" |
61 #include "extensions/browser/extension_registry.h" | 63 #include "extensions/browser/extension_registry.h" |
62 #include "extensions/common/extension.h" | 64 #include "extensions/common/extension.h" |
(...skipping 926 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
989 | 991 |
990 void BookmarkBarView::BookmarkMenuControllerDeleted( | 992 void BookmarkBarView::BookmarkMenuControllerDeleted( |
991 BookmarkMenuController* controller) { | 993 BookmarkMenuController* controller) { |
992 if (controller == bookmark_menu_) | 994 if (controller == bookmark_menu_) |
993 bookmark_menu_ = NULL; | 995 bookmark_menu_ = NULL; |
994 else if (controller == bookmark_drop_menu_) | 996 else if (controller == bookmark_drop_menu_) |
995 bookmark_drop_menu_ = NULL; | 997 bookmark_drop_menu_ = NULL; |
996 } | 998 } |
997 | 999 |
998 void BookmarkBarView::ShowImportDialog() { | 1000 void BookmarkBarView::ShowImportDialog() { |
999 int64 install_time = | 1001 int64 install_time = g_browser_process->GetMetricsServicesManager() |
1000 g_browser_process->local_state()->GetInt64(prefs::kInstallDate); | 1002 ->GetMetricsService() |
| 1003 ->GetInstallDate(); |
1001 int64 time_from_install = base::Time::Now().ToTimeT() - install_time; | 1004 int64 time_from_install = base::Time::Now().ToTimeT() - install_time; |
1002 if (bookmark_bar_state_ == BookmarkBar::SHOW) { | 1005 if (bookmark_bar_state_ == BookmarkBar::SHOW) { |
1003 UMA_HISTOGRAM_COUNTS("Import.ShowDialog.FromBookmarkBarView", | 1006 UMA_HISTOGRAM_COUNTS("Import.ShowDialog.FromBookmarkBarView", |
1004 time_from_install); | 1007 time_from_install); |
1005 } else if (bookmark_bar_state_ == BookmarkBar::DETACHED) { | 1008 } else if (bookmark_bar_state_ == BookmarkBar::DETACHED) { |
1006 UMA_HISTOGRAM_COUNTS("Import.ShowDialog.FromFloatingBookmarkBarView", | 1009 UMA_HISTOGRAM_COUNTS("Import.ShowDialog.FromFloatingBookmarkBarView", |
1007 time_from_install); | 1010 time_from_install); |
1008 } | 1011 } |
1009 | 1012 |
1010 chrome::ShowImportDialog(browser_); | 1013 chrome::ShowImportDialog(browser_); |
(...skipping 937 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1948 DCHECK(apps_page_shortcut_); | 1951 DCHECK(apps_page_shortcut_); |
1949 // Only perform layout if required. | 1952 // Only perform layout if required. |
1950 bool visible = chrome::ShouldShowAppsShortcutInBookmarkBar( | 1953 bool visible = chrome::ShouldShowAppsShortcutInBookmarkBar( |
1951 browser_->profile(), browser_->host_desktop_type()); | 1954 browser_->profile(), browser_->host_desktop_type()); |
1952 if (apps_page_shortcut_->visible() == visible) | 1955 if (apps_page_shortcut_->visible() == visible) |
1953 return; | 1956 return; |
1954 apps_page_shortcut_->SetVisible(visible); | 1957 apps_page_shortcut_->SetVisible(visible); |
1955 UpdateBookmarksSeparatorVisibility(); | 1958 UpdateBookmarksSeparatorVisibility(); |
1956 Layout(); | 1959 Layout(); |
1957 } | 1960 } |
OLD | NEW |