Chromium Code Reviews| 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/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 432 return node; | 432 return node; |
| 433 } | 433 } |
| 434 | 434 |
| 435 void RegisterUserPrefs(PrefRegistrySyncable* registry) { | 435 void RegisterUserPrefs(PrefRegistrySyncable* registry) { |
| 436 registry->RegisterBooleanPref(prefs::kShowBookmarkBar, | 436 registry->RegisterBooleanPref(prefs::kShowBookmarkBar, |
| 437 false, | 437 false, |
| 438 PrefRegistrySyncable::SYNCABLE_PREF); | 438 PrefRegistrySyncable::SYNCABLE_PREF); |
| 439 registry->RegisterBooleanPref(prefs::kEditBookmarksEnabled, | 439 registry->RegisterBooleanPref(prefs::kEditBookmarksEnabled, |
| 440 true, | 440 true, |
| 441 PrefRegistrySyncable::UNSYNCABLE_PREF); | 441 PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 442 registry->RegisterBooleanPref(prefs::kShowAppsShortcutInBookmarkBar, | |
| 443 true, | |
|
sky
2013/02/28 21:50:31
Shouldn't the value of this be based on whether I
beaudoin
2013/03/04 23:30:14
Isn't this the only entry-point to the CWS? If it'
sky
2013/03/05 01:31:29
Not sure. I was assuming we still have a link to t
| |
| 444 PrefRegistrySyncable::SYNCABLE_PREF); | |
| 442 } | 445 } |
| 443 | 446 |
| 444 const BookmarkNode* GetParentForNewNodes( | 447 const BookmarkNode* GetParentForNewNodes( |
| 445 const BookmarkNode* parent, | 448 const BookmarkNode* parent, |
| 446 const std::vector<const BookmarkNode*>& selection, | 449 const std::vector<const BookmarkNode*>& selection, |
| 447 int* index) { | 450 int* index) { |
| 448 const BookmarkNode* real_parent = parent; | 451 const BookmarkNode* real_parent = parent; |
| 449 | 452 |
| 450 if (selection.size() == 1 && selection[0]->is_folder()) | 453 if (selection.size() == 1 && selection[0]->is_folder()) |
| 451 real_parent = selection[0]; | 454 real_parent = selection[0]; |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 520 void DisableBookmarkBarViewAnimationsForTesting(bool disabled) { | 523 void DisableBookmarkBarViewAnimationsForTesting(bool disabled) { |
| 521 g_bookmark_bar_view_animations_disabled = disabled; | 524 g_bookmark_bar_view_animations_disabled = disabled; |
| 522 } | 525 } |
| 523 | 526 |
| 524 bool IsBookmarkBarViewAnimationsDisabled() { | 527 bool IsBookmarkBarViewAnimationsDisabled() { |
| 525 return g_bookmark_bar_view_animations_disabled; | 528 return g_bookmark_bar_view_animations_disabled; |
| 526 } | 529 } |
| 527 #endif | 530 #endif |
| 528 | 531 |
| 529 } // namespace bookmark_utils | 532 } // namespace bookmark_utils |
| OLD | NEW |