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

Side by Side Diff: chrome/browser/ui/bookmarks/bookmark_utils.h

Issue 1306873006: Fix mac_views_browser=1 compile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 5 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/ui/bookmarks/bookmark_utils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_UTILS_H_ 5 #ifndef CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_UTILS_H_
6 #define CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_UTILS_H_ 6 #define CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_UTILS_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 // Returns true if the bookmark data can be dropped on |drop_parent| at 143 // Returns true if the bookmark data can be dropped on |drop_parent| at
144 // |index|. A drop from a separate profile is always allowed, where as 144 // |index|. A drop from a separate profile is always allowed, where as
145 // a drop from the same profile is only allowed if none of the nodes in 145 // a drop from the same profile is only allowed if none of the nodes in
146 // |data| are an ancestor of |drop_parent| and one of the nodes isn't already 146 // |data| are an ancestor of |drop_parent| and one of the nodes isn't already
147 // a child of |drop_parent| at |index|. 147 // a child of |drop_parent| at |index|.
148 bool IsValidBookmarkDropLocation(Profile* profile, 148 bool IsValidBookmarkDropLocation(Profile* profile,
149 const bookmarks::BookmarkNodeData& data, 149 const bookmarks::BookmarkNodeData& data,
150 const bookmarks::BookmarkNode* drop_parent, 150 const bookmarks::BookmarkNode* drop_parent,
151 int index); 151 int index);
152 152
153 #if !defined(OS_MACOSX) && !defined(OS_ANDROID) 153 #if defined(TOOLKIT_VIEWS)
154 // TODO(estade): If Mac wants to use these, return gfx::Image instead. 154 // TODO(estade): If Mac wants to use these, return gfx::Image instead.
155 gfx::ImageSkia GetBookmarkFolderIcon(); 155 gfx::ImageSkia GetBookmarkFolderIcon();
156 gfx::ImageSkia GetBookmarkSupervisedFolderIcon(); 156 gfx::ImageSkia GetBookmarkSupervisedFolderIcon();
157 gfx::ImageSkia GetBookmarkManagedFolderIcon(); 157 gfx::ImageSkia GetBookmarkManagedFolderIcon();
158 #endif 158 #endif
159 159
160 } // namespace chrome 160 } // namespace chrome
161 161
162 #endif // CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_UTILS_H_ 162 #endif // CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_UTILS_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/bookmarks/bookmark_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698