| 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/ui/bookmarks/bookmark_utils.h" | 5 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 #include "ui/base/dragdrop/drop_target_event.h" | 32 #include "ui/base/dragdrop/drop_target_event.h" |
| 33 #include "ui/base/l10n/l10n_util.h" | 33 #include "ui/base/l10n/l10n_util.h" |
| 34 | 34 |
| 35 #if defined(ENABLE_EXTENSIONS) | 35 #if defined(ENABLE_EXTENSIONS) |
| 36 #include "chrome/browser/extensions/api/commands/command_service.h" | 36 #include "chrome/browser/extensions/api/commands/command_service.h" |
| 37 #include "extensions/browser/extension_registry.h" | 37 #include "extensions/browser/extension_registry.h" |
| 38 #include "extensions/common/extension_set.h" | 38 #include "extensions/common/extension_set.h" |
| 39 #endif | 39 #endif |
| 40 | 40 |
| 41 using bookmarks::BookmarkModel; | 41 using bookmarks::BookmarkModel; |
| 42 using bookmarks::BookmarkNode; |
| 42 | 43 |
| 43 namespace chrome { | 44 namespace chrome { |
| 44 | 45 |
| 45 int num_bookmark_urls_before_prompting = 15; | 46 int num_bookmark_urls_before_prompting = 15; |
| 46 | 47 |
| 47 namespace { | 48 namespace { |
| 48 | 49 |
| 49 // The ways in which extensions may customize the bookmark shortcut. | 50 // The ways in which extensions may customize the bookmark shortcut. |
| 50 enum BookmarkShortcutDisposition { | 51 enum BookmarkShortcutDisposition { |
| 51 BOOKMARK_SHORTCUT_DISPOSITION_UNCHANGED, | 52 BOOKMARK_SHORTCUT_DISPOSITION_UNCHANGED, |
| (...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 474 if (drop_parent->HasAncestor(node)) | 475 if (drop_parent->HasAncestor(node)) |
| 475 return false; | 476 return false; |
| 476 } | 477 } |
| 477 return true; | 478 return true; |
| 478 } | 479 } |
| 479 // From another profile, always accept. | 480 // From another profile, always accept. |
| 480 return true; | 481 return true; |
| 481 } | 482 } |
| 482 | 483 |
| 483 } // namespace chrome | 484 } // namespace chrome |
| OLD | NEW |