chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc - Issue 284893003: Move bookmarks/core/... to bookmarks/...

Side by Side Diff: chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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

« no previous file with comments | « chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h ('k') | chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/extensions/api/bookmark_manager_private/bookmark_manage r_private_api.h"	5 #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manage r_private_api.h"

6	6

7 #include <vector>	7 #include <vector>

8	8

9 #include "base/lazy_instance.h"	9 #include "base/lazy_instance.h"

10 #include "base/memory/linked_ptr.h"	10 #include "base/memory/linked_ptr.h"

11 #include "base/prefs/pref_service.h"	11 #include "base/prefs/pref_service.h"

12 #include "base/strings/string_number_conversions.h"	12 #include "base/strings/string_number_conversions.h"

13 #include "base/strings/utf_string_conversions.h"	13 #include "base/strings/utf_string_conversions.h"

14 #include "base/values.h"	14 #include "base/values.h"

15 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	15 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

16 #include "chrome/browser/bookmarks/bookmark_stats.h"	16 #include "chrome/browser/bookmarks/bookmark_stats.h"

17 #include "chrome/browser/extensions/api/bookmarks/bookmark_api_constants.h"	17 #include "chrome/browser/extensions/api/bookmarks/bookmark_api_constants.h"

18 #include "chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h"	18 #include "chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h"

19 #include "chrome/browser/extensions/extension_web_ui.h"	19 #include "chrome/browser/extensions/extension_web_ui.h"

20 #include "chrome/browser/profiles/profile.h"	20 #include "chrome/browser/profiles/profile.h"

21 #include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h"	21 #include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h"

22 #include "chrome/browser/undo/bookmark_undo_service.h"	22 #include "chrome/browser/undo/bookmark_undo_service.h"

23 #include "chrome/browser/undo/bookmark_undo_service_factory.h"	23 #include "chrome/browser/undo/bookmark_undo_service_factory.h"

24 #include "chrome/common/extensions/api/bookmark_manager_private.h"	24 #include "chrome/common/extensions/api/bookmark_manager_private.h"

25 #include "chrome/common/pref_names.h"	25 #include "chrome/common/pref_names.h"

26 #include "components/bookmarks/core/browser/bookmark_model.h"	26 #include "components/bookmarks/browser/bookmark_model.h"

27 #include "components/bookmarks/core/browser/bookmark_node_data.h"	27 #include "components/bookmarks/browser/bookmark_node_data.h"

28 #include "components/bookmarks/core/browser/bookmark_utils.h"	28 #include "components/bookmarks/browser/bookmark_utils.h"

29 #include "components/bookmarks/core/browser/scoped_group_bookmark_actions.h"	29 #include "components/bookmarks/browser/scoped_group_bookmark_actions.h"

30 #include "components/user_prefs/user_prefs.h"	30 #include "components/user_prefs/user_prefs.h"

31 #include "content/public/browser/render_view_host.h"	31 #include "content/public/browser/render_view_host.h"

32 #include "content/public/browser/web_contents.h"	32 #include "content/public/browser/web_contents.h"

33 #include "content/public/browser/web_ui.h"	33 #include "content/public/browser/web_ui.h"

34 #include "extensions/browser/extension_function_dispatcher.h"	34 #include "extensions/browser/extension_function_dispatcher.h"

35 #include "extensions/browser/view_type_utils.h"	35 #include "extensions/browser/view_type_utils.h"

36 #include "grit/generated_resources.h"	36 #include "grit/generated_resources.h"

37 #include "ui/base/dragdrop/drag_drop_types.h"	37 #include "ui/base/dragdrop/drag_drop_types.h"

38 #include "ui/base/l10n/l10n_util.h"	38 #include "ui/base/l10n/l10n_util.h"

39 #include "ui/base/webui/web_ui_util.h"	39 #include "ui/base/webui/web_ui_util.h"

(...skipping 747 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
787 result.enabled = undo_manager->redo_count() > 0;	787 result.enabled = undo_manager->redo_count() > 0;

788 result.label = base::UTF16ToUTF8(undo_manager->GetRedoLabel());	788 result.label = base::UTF16ToUTF8(undo_manager->GetRedoLabel());

789	789

790 results_ = RedoInfo::Results::Create(result);	790 results_ = RedoInfo::Results::Create(result);

791 #endif // !defined(OS_ANDROID)	791 #endif // !defined(OS_ANDROID)

792	792

793 return true;	793 return true;

794 }	794 }

795	795

796 } // namespace extensions	796 } // namespace extensions

OLD	NEW