| 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" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 #include "chrome/browser/ui/gtk/menu_gtk.h" | 38 #include "chrome/browser/ui/gtk/menu_gtk.h" |
| 39 #include "chrome/browser/ui/gtk/rounded_window.h" | 39 #include "chrome/browser/ui/gtk/rounded_window.h" |
| 40 #include "chrome/browser/ui/gtk/tabstrip_origin_provider.h" | 40 #include "chrome/browser/ui/gtk/tabstrip_origin_provider.h" |
| 41 #include "chrome/browser/ui/gtk/view_id_util.h" | 41 #include "chrome/browser/ui/gtk/view_id_util.h" |
| 42 #include "chrome/browser/ui/ntp_background_util.h" | 42 #include "chrome/browser/ui/ntp_background_util.h" |
| 43 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 43 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 44 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" | 44 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" |
| 45 #include "chrome/common/extensions/extension_constants.h" | 45 #include "chrome/common/extensions/extension_constants.h" |
| 46 #include "chrome/common/pref_names.h" | 46 #include "chrome/common/pref_names.h" |
| 47 #include "chrome/common/url_constants.h" | 47 #include "chrome/common/url_constants.h" |
| 48 #include "components/bookmarks/bookmark_pref_names.h" |
| 48 #include "content/public/browser/notification_details.h" | 49 #include "content/public/browser/notification_details.h" |
| 49 #include "content/public/browser/notification_source.h" | 50 #include "content/public/browser/notification_source.h" |
| 50 #include "content/public/browser/user_metrics.h" | 51 #include "content/public/browser/user_metrics.h" |
| 51 #include "content/public/browser/web_contents.h" | 52 #include "content/public/browser/web_contents.h" |
| 52 #include "content/public/browser/web_contents_view.h" | 53 #include "content/public/browser/web_contents_view.h" |
| 53 #include "grit/generated_resources.h" | 54 #include "grit/generated_resources.h" |
| 54 #include "grit/theme_resources.h" | 55 #include "grit/theme_resources.h" |
| 55 #include "grit/ui_resources.h" | 56 #include "grit/ui_resources.h" |
| 56 #include "ui/base/dragdrop/drag_drop_types.h" | 57 #include "ui/base/dragdrop/drag_drop_types.h" |
| 57 #include "ui/base/dragdrop/gtk_dnd_util.h" | 58 #include "ui/base/dragdrop/gtk_dnd_util.h" |
| (...skipping 1450 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 |