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/gtk/bookmarks/bookmark_bar_gtk.h" | 5 #include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
11 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
12 #include "base/pickle.h" | 12 #include "base/pickle.h" |
13 #include "base/prefs/pref_service.h" | 13 #include "base/prefs/pref_service.h" |
14 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
15 #include "chrome/browser/bookmarks/bookmark_model.h" | 15 #include "chrome/browser/bookmarks/bookmark_model.h" |
16 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 16 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
17 #include "chrome/browser/bookmarks/bookmark_node_data.h" | 17 #include "chrome/browser/bookmarks/bookmark_node_data.h" |
18 #include "chrome/browser/bookmarks/bookmark_stats.h" | 18 #include "chrome/browser/bookmarks/bookmark_stats.h" |
19 #include "chrome/browser/chrome_notification_types.h" | 19 #include "chrome/browser/chrome_notification_types.h" |
20 #include "chrome/browser/extensions/extension_service.h" | |
21 #include "chrome/browser/profiles/profile.h" | 20 #include "chrome/browser/profiles/profile.h" |
22 #include "chrome/browser/themes/theme_properties.h" | 21 #include "chrome/browser/themes/theme_properties.h" |
23 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" | 22 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" |
24 #include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h" | 23 #include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h" |
25 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" | 24 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" |
26 #include "chrome/browser/ui/browser.h" | 25 #include "chrome/browser/ui/browser.h" |
27 #include "chrome/browser/ui/chrome_pages.h" | 26 #include "chrome/browser/ui/chrome_pages.h" |
28 #include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_instructions_gtk.h" | 27 #include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_instructions_gtk.h" |
29 #include "chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h" | 28 #include "chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h" |
30 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h" | 29 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h" |
(...skipping 12 matching lines...) Expand all Loading... |
43 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 42 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
44 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" | 43 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" |
45 #include "chrome/common/extensions/extension_constants.h" | 44 #include "chrome/common/extensions/extension_constants.h" |
46 #include "chrome/common/pref_names.h" | 45 #include "chrome/common/pref_names.h" |
47 #include "chrome/common/url_constants.h" | 46 #include "chrome/common/url_constants.h" |
48 #include "content/public/browser/notification_details.h" | 47 #include "content/public/browser/notification_details.h" |
49 #include "content/public/browser/notification_source.h" | 48 #include "content/public/browser/notification_source.h" |
50 #include "content/public/browser/user_metrics.h" | 49 #include "content/public/browser/user_metrics.h" |
51 #include "content/public/browser/web_contents.h" | 50 #include "content/public/browser/web_contents.h" |
52 #include "content/public/browser/web_contents_view.h" | 51 #include "content/public/browser/web_contents_view.h" |
| 52 #include "extensions/browser/extension_registry.h" |
| 53 #include "extensions/common/extension.h" |
| 54 #include "extensions/common/extension_set.h" |
53 #include "grit/generated_resources.h" | 55 #include "grit/generated_resources.h" |
54 #include "grit/theme_resources.h" | 56 #include "grit/theme_resources.h" |
55 #include "grit/ui_resources.h" | 57 #include "grit/ui_resources.h" |
56 #include "ui/base/dragdrop/drag_drop_types.h" | 58 #include "ui/base/dragdrop/drag_drop_types.h" |
57 #include "ui/base/dragdrop/gtk_dnd_util.h" | 59 #include "ui/base/dragdrop/gtk_dnd_util.h" |
58 #include "ui/base/l10n/l10n_util.h" | 60 #include "ui/base/l10n/l10n_util.h" |
59 #include "ui/base/resource/resource_bundle.h" | 61 #include "ui/base/resource/resource_bundle.h" |
60 #include "ui/gfx/canvas_skia_paint.h" | 62 #include "ui/gfx/canvas_skia_paint.h" |
61 #include "ui/gfx/gtk_compat.h" | 63 #include "ui/gfx/gtk_compat.h" |
62 #include "ui/gfx/gtk_util.h" | 64 #include "ui/gfx/gtk_util.h" |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 " ythickness = 0\n" | 118 " ythickness = 0\n" |
117 " GtkWidget::focus-padding = 0\n" | 119 " GtkWidget::focus-padding = 0\n" |
118 " GtkContainer::border-width = 0\n" | 120 " GtkContainer::border-width = 0\n" |
119 " GtkToolbar::internal-padding = 1\n" | 121 " GtkToolbar::internal-padding = 1\n" |
120 " GtkToolbar::shadow-type = GTK_SHADOW_NONE\n" | 122 " GtkToolbar::shadow-type = GTK_SHADOW_NONE\n" |
121 "}\n" | 123 "}\n" |
122 "widget \"*chrome-bookmark-toolbar\" style \"chrome-bookmark-toolbar\""); | 124 "widget \"*chrome-bookmark-toolbar\" style \"chrome-bookmark-toolbar\""); |
123 } | 125 } |
124 | 126 |
125 void RecordAppLaunch(Profile* profile, const GURL& url) { | 127 void RecordAppLaunch(Profile* profile, const GURL& url) { |
126 DCHECK(profile->GetExtensionService()); | |
127 const extensions::Extension* extension = | 128 const extensions::Extension* extension = |
128 profile->GetExtensionService()->GetInstalledApp(url); | 129 ExtensionRegistry::Get(profile)->enabled_extensions().GetAppByURL(url); |
129 if (!extension) | 130 if (!extension) |
130 return; | 131 return; |
131 | 132 |
132 CoreAppLauncherHandler::RecordAppLaunchType( | 133 CoreAppLauncherHandler::RecordAppLaunchType( |
133 extension_misc::APP_LAUNCH_BOOKMARK_BAR, | 134 extension_misc::APP_LAUNCH_BOOKMARK_BAR, |
134 extension->GetType()); | 135 extension->GetType()); |
135 } | 136 } |
136 | 137 |
137 } // namespace | 138 } // namespace |
138 | 139 |
(...skipping 1369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1508 void BookmarkBarGtk::OnEditBookmarksEnabledChanged() { | 1509 void BookmarkBarGtk::OnEditBookmarksEnabledChanged() { |
1509 GtkDestDefaults dest_defaults = | 1510 GtkDestDefaults dest_defaults = |
1510 *edit_bookmarks_enabled_ ? GTK_DEST_DEFAULT_ALL : | 1511 *edit_bookmarks_enabled_ ? GTK_DEST_DEFAULT_ALL : |
1511 GTK_DEST_DEFAULT_DROP; | 1512 GTK_DEST_DEFAULT_DROP; |
1512 gtk_drag_dest_set(overflow_button_, dest_defaults, NULL, 0, kDragAction); | 1513 gtk_drag_dest_set(overflow_button_, dest_defaults, NULL, 0, kDragAction); |
1513 gtk_drag_dest_set(other_bookmarks_button_, dest_defaults, | 1514 gtk_drag_dest_set(other_bookmarks_button_, dest_defaults, |
1514 NULL, 0, kDragAction); | 1515 NULL, 0, kDragAction); |
1515 ui::SetDestTargetList(overflow_button_, kDestTargetList); | 1516 ui::SetDestTargetList(overflow_button_, kDestTargetList); |
1516 ui::SetDestTargetList(other_bookmarks_button_, kDestTargetList); | 1517 ui::SetDestTargetList(other_bookmarks_button_, kDestTargetList); |
1517 } | 1518 } |
OLD | NEW |