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> |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" | 43 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" |
44 #include "chrome/browser/ui/views/event_utils.h" | 44 #include "chrome/browser/ui/views/event_utils.h" |
45 #include "chrome/browser/ui/views/frame/browser_view.h" | 45 #include "chrome/browser/ui/views/frame/browser_view.h" |
46 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 46 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
47 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" | 47 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" |
48 #include "chrome/common/chrome_switches.h" | 48 #include "chrome/common/chrome_switches.h" |
49 #include "chrome/common/extensions/extension_constants.h" | 49 #include "chrome/common/extensions/extension_constants.h" |
50 #include "chrome/common/pref_names.h" | 50 #include "chrome/common/pref_names.h" |
51 #include "chrome/common/url_constants.h" | 51 #include "chrome/common/url_constants.h" |
52 #include "components/bookmarks/browser/bookmark_model.h" | 52 #include "components/bookmarks/browser/bookmark_model.h" |
| 53 #include "components/metrics/metrics_service.h" |
53 #include "content/public/browser/notification_details.h" | 54 #include "content/public/browser/notification_details.h" |
54 #include "content/public/browser/notification_source.h" | 55 #include "content/public/browser/notification_source.h" |
55 #include "content/public/browser/page_navigator.h" | 56 #include "content/public/browser/page_navigator.h" |
56 #include "content/public/browser/render_view_host.h" | 57 #include "content/public/browser/render_view_host.h" |
57 #include "content/public/browser/render_widget_host_view.h" | 58 #include "content/public/browser/render_widget_host_view.h" |
58 #include "content/public/browser/user_metrics.h" | 59 #include "content/public/browser/user_metrics.h" |
59 #include "content/public/browser/web_contents.h" | 60 #include "content/public/browser/web_contents.h" |
60 #include "content/public/common/page_transition_types.h" | 61 #include "content/public/common/page_transition_types.h" |
61 #include "extensions/browser/extension_registry.h" | 62 #include "extensions/browser/extension_registry.h" |
62 #include "extensions/common/extension.h" | 63 #include "extensions/common/extension.h" |
(...skipping 932 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
995 | 996 |
996 void BookmarkBarView::BookmarkMenuControllerDeleted( | 997 void BookmarkBarView::BookmarkMenuControllerDeleted( |
997 BookmarkMenuController* controller) { | 998 BookmarkMenuController* controller) { |
998 if (controller == bookmark_menu_) | 999 if (controller == bookmark_menu_) |
999 bookmark_menu_ = NULL; | 1000 bookmark_menu_ = NULL; |
1000 else if (controller == bookmark_drop_menu_) | 1001 else if (controller == bookmark_drop_menu_) |
1001 bookmark_drop_menu_ = NULL; | 1002 bookmark_drop_menu_ = NULL; |
1002 } | 1003 } |
1003 | 1004 |
1004 void BookmarkBarView::ShowImportDialog() { | 1005 void BookmarkBarView::ShowImportDialog() { |
1005 int64 install_time = | 1006 int64 install_time = g_browser_process->metrics_service()->GetInstallDate(); |
1006 g_browser_process->local_state()->GetInt64(prefs::kInstallDate); | |
1007 int64 time_from_install = base::Time::Now().ToTimeT() - install_time; | 1007 int64 time_from_install = base::Time::Now().ToTimeT() - install_time; |
1008 if (bookmark_bar_state_ == BookmarkBar::SHOW) { | 1008 if (bookmark_bar_state_ == BookmarkBar::SHOW) { |
1009 UMA_HISTOGRAM_COUNTS("Import.ShowDialog.FromBookmarkBarView", | 1009 UMA_HISTOGRAM_COUNTS("Import.ShowDialog.FromBookmarkBarView", |
1010 time_from_install); | 1010 time_from_install); |
1011 } else if (bookmark_bar_state_ == BookmarkBar::DETACHED) { | 1011 } else if (bookmark_bar_state_ == BookmarkBar::DETACHED) { |
1012 UMA_HISTOGRAM_COUNTS("Import.ShowDialog.FromFloatingBookmarkBarView", | 1012 UMA_HISTOGRAM_COUNTS("Import.ShowDialog.FromFloatingBookmarkBarView", |
1013 time_from_install); | 1013 time_from_install); |
1014 } | 1014 } |
1015 | 1015 |
1016 chrome::ShowImportDialog(browser_); | 1016 chrome::ShowImportDialog(browser_); |
(...skipping 937 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1954 DCHECK(apps_page_shortcut_); | 1954 DCHECK(apps_page_shortcut_); |
1955 // Only perform layout if required. | 1955 // Only perform layout if required. |
1956 bool visible = chrome::ShouldShowAppsShortcutInBookmarkBar( | 1956 bool visible = chrome::ShouldShowAppsShortcutInBookmarkBar( |
1957 browser_->profile(), browser_->host_desktop_type()); | 1957 browser_->profile(), browser_->host_desktop_type()); |
1958 if (apps_page_shortcut_->visible() == visible) | 1958 if (apps_page_shortcut_->visible() == visible) |
1959 return; | 1959 return; |
1960 apps_page_shortcut_->SetVisible(visible); | 1960 apps_page_shortcut_->SetVisible(visible); |
1961 UpdateBookmarksSeparatorVisibility(); | 1961 UpdateBookmarksSeparatorVisibility(); |
1962 Layout(); | 1962 Layout(); |
1963 } | 1963 } |
OLD | NEW |