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

Side by Side Diff: chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc

Issue 2367533003: Always add bookmarks to the mobile node on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Put new method into ifdef Created 4 years, 2 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/bookmarks/bookmark_utils_desktop.h" 5 #include "chrome/browser/ui/bookmarks/bookmark_utils_desktop.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 11 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/search/search.h" 13 #include "chrome/browser/search/search.h"
14 #include "chrome/browser/ui/app_list/app_list_util.h" 14 #include "chrome/browser/ui/app_list/app_list_util.h"
15 #include "chrome/browser/ui/bookmarks/bookmark_editor.h" 15 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"
16 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" 16 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
17 #include "chrome/browser/ui/browser.h" 17 #include "chrome/browser/ui/browser.h"
18 #include "chrome/browser/ui/browser_navigator.h" 18 #include "chrome/browser/ui/browser_navigator.h"
19 #include "chrome/browser/ui/browser_window.h" 19 #include "chrome/browser/ui/browser_window.h"
20 #include "chrome/browser/ui/simple_message_box.h" 20 #include "chrome/browser/ui/simple_message_box.h"
21 #include "chrome/browser/ui/tabs/tab_strip_model.h" 21 #include "chrome/browser/ui/tabs/tab_strip_model.h"
22 #include "chrome/common/pref_names.h" 22 #include "chrome/common/pref_names.h"
23 #include "chrome/common/url_constants.h" 23 #include "chrome/common/url_constants.h"
24 #include "chrome/grit/chromium_strings.h" 24 #include "chrome/grit/chromium_strings.h"
25 #include "chrome/grit/generated_resources.h" 25 #include "chrome/grit/generated_resources.h"
26 #include "components/bookmarks/browser/bookmark_model.h" 26 #include "components/bookmarks/browser/bookmark_model.h"
27 #include "components/bookmarks/browser/bookmark_node_data.h" 27 #include "components/bookmarks/browser/bookmark_node_data.h"
28 #include "components/bookmarks/browser/bookmark_utils.h"
28 #include "components/prefs/pref_service.h" 29 #include "components/prefs/pref_service.h"
29 #include "components/search/search.h" 30 #include "components/search/search.h"
30 #include "components/url_formatter/url_formatter.h" 31 #include "components/url_formatter/url_formatter.h"
31 #include "components/user_prefs/user_prefs.h" 32 #include "components/user_prefs/user_prefs.h"
32 #include "content/public/browser/web_contents.h" 33 #include "content/public/browser/web_contents.h"
33 #include "ui/base/dragdrop/drag_drop_types.h" 34 #include "ui/base/dragdrop/drag_drop_types.h"
34 #include "ui/base/dragdrop/drop_target_event.h" 35 #include "ui/base/dragdrop/drop_target_event.h"
35 #include "ui/base/l10n/l10n_util.h" 36 #include "ui/base/l10n/l10n_util.h"
36 37
37 #if defined(ENABLE_EXTENSIONS) 38 #if defined(ENABLE_EXTENSIONS)
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 IDS_BOOKMARK_EDITOR_CONFIRM_DELETE, 236 IDS_BOOKMARK_EDITOR_CONFIRM_DELETE,
236 ChildURLCountTotal(node))) == 237 ChildURLCountTotal(node))) ==
237 MESSAGE_BOX_RESULT_YES; 238 MESSAGE_BOX_RESULT_YES;
238 } 239 }
239 240
240 void ShowBookmarkAllTabsDialog(Browser* browser) { 241 void ShowBookmarkAllTabsDialog(Browser* browser) {
241 Profile* profile = browser->profile(); 242 Profile* profile = browser->profile();
242 BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile); 243 BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile);
243 DCHECK(model && model->loaded()); 244 DCHECK(model && model->loaded());
244 245
245 const BookmarkNode* parent = model->GetParentForNewNodes(); 246 const BookmarkNode* parent = GetParentForNewNodes(model);
246 BookmarkEditor::EditDetails details = 247 BookmarkEditor::EditDetails details =
247 BookmarkEditor::EditDetails::AddFolder(parent, parent->child_count()); 248 BookmarkEditor::EditDetails::AddFolder(parent, parent->child_count());
248 GetURLsForOpenTabs(browser, &(details.urls)); 249 GetURLsForOpenTabs(browser, &(details.urls));
249 DCHECK(!details.urls.empty()); 250 DCHECK(!details.urls.empty());
250 251
251 BookmarkEditor::Show(browser->window()->GetNativeWindow(), profile, details, 252 BookmarkEditor::Show(browser->window()->GetNativeWindow(), profile, details,
252 BookmarkEditor::SHOW_TREE); 253 BookmarkEditor::SHOW_TREE);
253 } 254 }
254 255
255 bool HasBookmarkURLs(const std::vector<const BookmarkNode*>& selection) { 256 bool HasBookmarkURLs(const std::vector<const BookmarkNode*>& selection) {
256 OpenURLIterator iterator(selection); 257 OpenURLIterator iterator(selection);
257 return iterator.has_next(); 258 return iterator.has_next();
258 } 259 }
259 260
260 bool HasBookmarkURLsAllowedInIncognitoMode( 261 bool HasBookmarkURLsAllowedInIncognitoMode(
261 const std::vector<const BookmarkNode*>& selection, 262 const std::vector<const BookmarkNode*>& selection,
262 content::BrowserContext* browser_context) { 263 content::BrowserContext* browser_context) {
263 OpenURLIterator iterator(selection); 264 OpenURLIterator iterator(selection);
264 while (iterator.has_next()) { 265 while (iterator.has_next()) {
265 const GURL* url = iterator.NextURL(); 266 const GURL* url = iterator.NextURL();
266 if (IsURLAllowedInIncognito(*url, browser_context)) 267 if (IsURLAllowedInIncognito(*url, browser_context))
267 return true; 268 return true;
268 } 269 }
269 return false; 270 return false;
270 } 271 }
271 #endif // !defined(OS_ANDROID) 272 #endif // !defined(OS_ANDROID)
272 273
273 } // namespace chrome 274 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | components/bookmarks/browser/bookmark_model.h » ('j') | components/bookmarks/browser/bookmark_utils.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698