OLD | NEW |
---|---|
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" | |
Mattias Nissler (ping if slow)
2012/12/19 19:50:22
remove duplicate #include
Jói
2012/12/20 16:30:31
Done.
| |
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 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
431 | 432 |
432 if (new_parent != node->parent()) | 433 if (new_parent != node->parent()) |
433 model->Move(node, new_parent, new_parent->child_count()); | 434 model->Move(node, new_parent, new_parent->child_count()); |
434 if (node->is_url()) | 435 if (node->is_url()) |
435 model->SetURL(node, new_url); | 436 model->SetURL(node, new_url); |
436 model->SetTitle(node, new_title); | 437 model->SetTitle(node, new_title); |
437 | 438 |
438 return node; | 439 return node; |
439 } | 440 } |
440 | 441 |
441 void RegisterUserPrefs(PrefServiceBase* prefs) { | 442 void RegisterUserPrefs(PrefServiceSyncable* prefs) { |
442 prefs->RegisterBooleanPref(prefs::kShowBookmarkBar, | 443 prefs->RegisterBooleanPref(prefs::kShowBookmarkBar, |
443 false, | 444 false, |
444 PrefServiceBase::SYNCABLE_PREF); | 445 PrefServiceSyncable::SYNCABLE_PREF); |
445 prefs->RegisterBooleanPref(prefs::kEditBookmarksEnabled, | 446 prefs->RegisterBooleanPref(prefs::kEditBookmarksEnabled, |
446 true, | 447 true, |
447 PrefServiceBase::UNSYNCABLE_PREF); | 448 PrefServiceSyncable::UNSYNCABLE_PREF); |
448 } | 449 } |
449 | 450 |
450 const BookmarkNode* GetParentForNewNodes( | 451 const BookmarkNode* GetParentForNewNodes( |
451 const BookmarkNode* parent, | 452 const BookmarkNode* parent, |
452 const std::vector<const BookmarkNode*>& selection, | 453 const std::vector<const BookmarkNode*>& selection, |
453 int* index) { | 454 int* index) { |
454 const BookmarkNode* real_parent = parent; | 455 const BookmarkNode* real_parent = parent; |
455 | 456 |
456 if (selection.size() == 1 && selection[0]->is_folder()) | 457 if (selection.size() == 1 && selection[0]->is_folder()) |
457 real_parent = selection[0]; | 458 real_parent = selection[0]; |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
526 void DisableBookmarkBarViewAnimationsForTesting(bool disabled) { | 527 void DisableBookmarkBarViewAnimationsForTesting(bool disabled) { |
527 g_bookmark_bar_view_animations_disabled = disabled; | 528 g_bookmark_bar_view_animations_disabled = disabled; |
528 } | 529 } |
529 | 530 |
530 bool IsBookmarkBarViewAnimationsDisabled() { | 531 bool IsBookmarkBarViewAnimationsDisabled() { |
531 return g_bookmark_bar_view_animations_disabled; | 532 return g_bookmark_bar_view_animations_disabled; |
532 } | 533 } |
533 #endif | 534 #endif |
534 | 535 |
535 } // namespace bookmark_utils | 536 } // namespace bookmark_utils |
OLD | NEW |