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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc

Issue 16625004: components: Move user_prefs into user_prefs namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 6 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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_drag_drop_views.h" 5 #include "chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "chrome/browser/bookmarks/bookmark_model.h" 9 #include "chrome/browser/bookmarks/bookmark_model.h"
10 #include "chrome/browser/bookmarks/bookmark_node_data.h" 10 #include "chrome/browser/bookmarks/bookmark_node_data.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 // WebContentsViewAura, instead of WebContentsViewViews. 46 // WebContentsViewAura, instead of WebContentsViewViews.
47 views::RunShellDrag(view, data, gfx::Point(), operation, 47 views::RunShellDrag(view, data, gfx::Point(), operation,
48 ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE); 48 ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE);
49 } 49 }
50 50
51 base::MessageLoop::current()->SetNestableTasksAllowed(was_nested); 51 base::MessageLoop::current()->SetNestableTasksAllowed(was_nested);
52 } 52 }
53 53
54 int GetBookmarkDragOperation(content::BrowserContext* browser_context, 54 int GetBookmarkDragOperation(content::BrowserContext* browser_context,
55 const BookmarkNode* node) { 55 const BookmarkNode* node) {
56 PrefService* prefs = components::UserPrefs::Get(browser_context); 56 PrefService* prefs = user_prefs::UserPrefs::Get(browser_context);
57 57
58 int move = ui::DragDropTypes::DRAG_MOVE; 58 int move = ui::DragDropTypes::DRAG_MOVE;
59 if (!prefs->GetBoolean(prefs::kEditBookmarksEnabled)) 59 if (!prefs->GetBoolean(prefs::kEditBookmarksEnabled))
60 move = ui::DragDropTypes::DRAG_NONE; 60 move = ui::DragDropTypes::DRAG_NONE;
61 if (node->is_url()) 61 if (node->is_url())
62 return ui::DragDropTypes::DRAG_COPY | ui::DragDropTypes::DRAG_LINK | move; 62 return ui::DragDropTypes::DRAG_COPY | ui::DragDropTypes::DRAG_LINK | move;
63 return ui::DragDropTypes::DRAG_COPY | move; 63 return ui::DragDropTypes::DRAG_COPY | move;
64 } 64 }
65 65
66 int GetPreferredBookmarkDropOperation(int source_operations, int operations) { 66 int GetPreferredBookmarkDropOperation(int source_operations, int operations) {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 if (drop_parent->HasAncestor(node)) 124 if (drop_parent->HasAncestor(node))
125 return false; 125 return false;
126 } 126 }
127 return true; 127 return true;
128 } 128 }
129 // From the same profile, always accept. 129 // From the same profile, always accept.
130 return true; 130 return true;
131 } 131 }
132 132
133 } // namespace chrome 133 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698