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

Side by Side Diff: chrome/browser/bookmarks/bookmark_utils.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: WIP, latest changes from kaiwang@ Created 8 years 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/bookmarks/bookmark_utils.h" 5 #include "chrome/browser/bookmarks/bookmark_utils.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
11 #include "base/i18n/case_conversion.h" 11 #include "base/i18n/case_conversion.h"
12 #include "base/i18n/string_search.h" 12 #include "base/i18n/string_search.h"
13 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
14 #include "base/prefs/public/pref_service_base.h"
15 #include "base/string16.h" 14 #include "base/string16.h"
16 #include "base/time.h" 15 #include "base/time.h"
17 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
18 #include "chrome/browser/bookmarks/bookmark_model.h" 17 #include "chrome/browser/bookmarks/bookmark_model.h"
19 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 18 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
20 #include "chrome/browser/bookmarks/bookmark_node_data.h" 19 #include "chrome/browser/bookmarks/bookmark_node_data.h"
21 #include "chrome/browser/history/query_parser.h" 20 #include "chrome/browser/history/query_parser.h"
21 #include "chrome/browser/prefs/pref_service.h"
22 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/common/pref_names.h" 24 #include "chrome/common/pref_names.h"
24 #include "content/public/browser/user_metrics.h" 25 #include "content/public/browser/user_metrics.h"
25 #include "grit/ui_strings.h" 26 #include "grit/ui_strings.h"
26 #include "net/base/net_util.h" 27 #include "net/base/net_util.h"
27 #include "ui/base/dragdrop/drag_drop_types.h" 28 #include "ui/base/dragdrop/drag_drop_types.h"
28 #include "ui/base/events/event.h" 29 #include "ui/base/events/event.h"
29 #include "ui/base/l10n/l10n_util.h" 30 #include "ui/base/l10n/l10n_util.h"
30 #include "ui/base/models/tree_node_iterator.h" 31 #include "ui/base/models/tree_node_iterator.h"
31 32
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 428
428 if (new_parent != node->parent()) 429 if (new_parent != node->parent())
429 model->Move(node, new_parent, new_parent->child_count()); 430 model->Move(node, new_parent, new_parent->child_count());
430 if (node->is_url()) 431 if (node->is_url())
431 model->SetURL(node, new_url); 432 model->SetURL(node, new_url);
432 model->SetTitle(node, new_title); 433 model->SetTitle(node, new_title);
433 434
434 return node; 435 return node;
435 } 436 }
436 437
437 void RegisterUserPrefs(PrefServiceBase* prefs) { 438 void RegisterUserPrefs(PrefServiceSyncable* prefs) {
438 prefs->RegisterBooleanPref(prefs::kShowBookmarkBar, 439 prefs->RegisterBooleanPref(prefs::kShowBookmarkBar,
439 false, 440 false,
440 PrefServiceBase::SYNCABLE_PREF); 441 PrefServiceSyncable::SYNCABLE_PREF);
441 prefs->RegisterBooleanPref(prefs::kEditBookmarksEnabled, 442 prefs->RegisterBooleanPref(prefs::kEditBookmarksEnabled,
442 true, 443 true,
443 PrefServiceBase::UNSYNCABLE_PREF); 444 PrefServiceSyncable::UNSYNCABLE_PREF);
444 } 445 }
445 446
446 const BookmarkNode* GetParentForNewNodes( 447 const BookmarkNode* GetParentForNewNodes(
447 const BookmarkNode* parent, 448 const BookmarkNode* parent,
448 const std::vector<const BookmarkNode*>& selection, 449 const std::vector<const BookmarkNode*>& selection,
449 int* index) { 450 int* index) {
450 const BookmarkNode* real_parent = parent; 451 const BookmarkNode* real_parent = parent;
451 452
452 if (selection.size() == 1 && selection[0]->is_folder()) 453 if (selection.size() == 1 && selection[0]->is_folder())
453 real_parent = selection[0]; 454 real_parent = selection[0];
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 void DisableBookmarkBarViewAnimationsForTesting(bool disabled) { 523 void DisableBookmarkBarViewAnimationsForTesting(bool disabled) {
523 g_bookmark_bar_view_animations_disabled = disabled; 524 g_bookmark_bar_view_animations_disabled = disabled;
524 } 525 }
525 526
526 bool IsBookmarkBarViewAnimationsDisabled() { 527 bool IsBookmarkBarViewAnimationsDisabled() {
527 return g_bookmark_bar_view_animations_disabled; 528 return g_bookmark_bar_view_animations_disabled;
528 } 529 }
529 #endif 530 #endif
530 531
531 } // namespace bookmark_utils 532 } // namespace bookmark_utils
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698