| 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 27 matching lines...) Expand all Loading... |
| 38 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 38 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 39 #include "chrome/browser/ui/view_ids.h" | 39 #include "chrome/browser/ui/view_ids.h" |
| 40 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h" | 40 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h" |
| 41 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view_observer.h" | 41 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view_observer.h" |
| 42 #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h" | 42 #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h" |
| 43 #include "chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.h" | 43 #include "chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.h" |
| 44 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" | 44 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" |
| 45 #include "chrome/browser/ui/views/event_utils.h" | 45 #include "chrome/browser/ui/views/event_utils.h" |
| 46 #include "chrome/browser/ui/views/frame/browser_view.h" | 46 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 47 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 47 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
| 48 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" | |
| 49 #include "chrome/common/chrome_switches.h" | 48 #include "chrome/common/chrome_switches.h" |
| 50 #include "chrome/common/extensions/extension_constants.h" | 49 #include "chrome/common/extensions/extension_constants.h" |
| 50 #include "chrome/common/extensions/extension_metrics.h" |
| 51 #include "chrome/common/pref_names.h" | 51 #include "chrome/common/pref_names.h" |
| 52 #include "chrome/common/url_constants.h" | 52 #include "chrome/common/url_constants.h" |
| 53 #include "chrome/grit/generated_resources.h" | 53 #include "chrome/grit/generated_resources.h" |
| 54 #include "components/bookmarks/browser/bookmark_model.h" | 54 #include "components/bookmarks/browser/bookmark_model.h" |
| 55 #include "components/metrics/metrics_service.h" | 55 #include "components/metrics/metrics_service.h" |
| 56 #include "content/public/browser/notification_details.h" | 56 #include "content/public/browser/notification_details.h" |
| 57 #include "content/public/browser/notification_source.h" | 57 #include "content/public/browser/notification_source.h" |
| 58 #include "content/public/browser/page_navigator.h" | 58 #include "content/public/browser/page_navigator.h" |
| 59 #include "content/public/browser/render_view_host.h" | 59 #include "content/public/browser/render_view_host.h" |
| 60 #include "content/public/browser/render_widget_host_view.h" | 60 #include "content/public/browser/render_widget_host_view.h" |
| (...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 339 DISALLOW_COPY_AND_ASSIGN(OverFlowButton); | 339 DISALLOW_COPY_AND_ASSIGN(OverFlowButton); |
| 340 }; | 340 }; |
| 341 | 341 |
| 342 void RecordAppLaunch(Profile* profile, GURL url) { | 342 void RecordAppLaunch(Profile* profile, GURL url) { |
| 343 const extensions::Extension* extension = | 343 const extensions::Extension* extension = |
| 344 extensions::ExtensionRegistry::Get(profile) | 344 extensions::ExtensionRegistry::Get(profile) |
| 345 ->enabled_extensions().GetAppByURL(url); | 345 ->enabled_extensions().GetAppByURL(url); |
| 346 if (!extension) | 346 if (!extension) |
| 347 return; | 347 return; |
| 348 | 348 |
| 349 CoreAppLauncherHandler::RecordAppLaunchType( | 349 extensions::RecordAppLaunchType(extension_misc::APP_LAUNCH_BOOKMARK_BAR, |
| 350 extension_misc::APP_LAUNCH_BOOKMARK_BAR, | 350 extension->GetType()); |
| 351 extension->GetType()); | |
| 352 } | 351 } |
| 353 | 352 |
| 354 } // namespace | 353 } // namespace |
| 355 | 354 |
| 356 // DropLocation --------------------------------------------------------------- | 355 // DropLocation --------------------------------------------------------------- |
| 357 | 356 |
| 358 struct BookmarkBarView::DropLocation { | 357 struct BookmarkBarView::DropLocation { |
| 359 DropLocation() | 358 DropLocation() |
| 360 : index(-1), | 359 : index(-1), |
| 361 operation(ui::DragDropTypes::DRAG_NONE), | 360 operation(ui::DragDropTypes::DRAG_NONE), |
| (...skipping 1606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1968 return; | 1967 return; |
| 1969 apps_page_shortcut_->SetVisible(visible); | 1968 apps_page_shortcut_->SetVisible(visible); |
| 1970 UpdateBookmarksSeparatorVisibility(); | 1969 UpdateBookmarksSeparatorVisibility(); |
| 1971 LayoutAndPaint(); | 1970 LayoutAndPaint(); |
| 1972 } | 1971 } |
| 1973 | 1972 |
| 1974 void BookmarkBarView::OnShowManagedBookmarksPrefChanged() { | 1973 void BookmarkBarView::OnShowManagedBookmarksPrefChanged() { |
| 1975 if (UpdateOtherAndManagedButtonsVisibility()) | 1974 if (UpdateOtherAndManagedButtonsVisibility()) |
| 1976 LayoutAndPaint(); | 1975 LayoutAndPaint(); |
| 1977 } | 1976 } |
| OLD | NEW |