Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1082)

Side by Side Diff: chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
14 #include "chrome/browser/bookmarks/bookmark_model.h" 15 #include "chrome/browser/bookmarks/bookmark_model.h"
15 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 16 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
16 #include "chrome/browser/bookmarks/bookmark_node_data.h" 17 #include "chrome/browser/bookmarks/bookmark_node_data.h"
17 #include "chrome/browser/bookmarks/bookmark_utils.h" 18 #include "chrome/browser/bookmarks/bookmark_utils.h"
18 #include "chrome/browser/browser_shutdown.h" 19 #include "chrome/browser/browser_shutdown.h"
19 #include "chrome/browser/extensions/extension_service.h" 20 #include "chrome/browser/extensions/extension_service.h"
20 #include "chrome/browser/prefs/pref_service.h"
21 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" 22 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h"
23 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" 23 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
24 #include "chrome/browser/ui/browser.h" 24 #include "chrome/browser/ui/browser.h"
25 #include "chrome/browser/ui/chrome_pages.h" 25 #include "chrome/browser/ui/chrome_pages.h"
26 #include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_instructions_gtk.h" 26 #include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_instructions_gtk.h"
27 #include "chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h" 27 #include "chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h"
28 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h" 28 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
29 #include "chrome/browser/ui/gtk/browser_window_gtk.h" 29 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
30 #include "chrome/browser/ui/gtk/custom_button.h" 30 #include "chrome/browser/ui/gtk/custom_button.h"
(...skipping 1427 matching lines...) Expand 10 before | Expand all | Expand 10 after
1458 void BookmarkBarGtk::OnEditBookmarksEnabledChanged() { 1458 void BookmarkBarGtk::OnEditBookmarksEnabledChanged() {
1459 GtkDestDefaults dest_defaults = 1459 GtkDestDefaults dest_defaults =
1460 *edit_bookmarks_enabled_ ? GTK_DEST_DEFAULT_ALL : 1460 *edit_bookmarks_enabled_ ? GTK_DEST_DEFAULT_ALL :
1461 GTK_DEST_DEFAULT_DROP; 1461 GTK_DEST_DEFAULT_DROP;
1462 gtk_drag_dest_set(overflow_button_, dest_defaults, NULL, 0, kDragAction); 1462 gtk_drag_dest_set(overflow_button_, dest_defaults, NULL, 0, kDragAction);
1463 gtk_drag_dest_set(other_bookmarks_button_, dest_defaults, 1463 gtk_drag_dest_set(other_bookmarks_button_, dest_defaults,
1464 NULL, 0, kDragAction); 1464 NULL, 0, kDragAction);
1465 ui::SetDestTargetList(overflow_button_, kDestTargetList); 1465 ui::SetDestTargetList(overflow_button_, kDestTargetList);
1466 ui::SetDestTargetList(other_bookmarks_button_, kDestTargetList); 1466 ui::SetDestTargetList(other_bookmarks_button_, kDestTargetList);
1467 } 1467 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gesture_prefs_observer_factory_aura.cc ('k') | chrome/browser/ui/gtk/browser_titlebar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698