diff options
32 files changed, 155 insertions, 57 deletions
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index f401772..de1885e 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -130,6 +130,7 @@ source_set("browser") { "//components/translate/core/browser", "//components/translate/core/common", "//components/ui/zoom:ui_zoom", + "//components/undo", "//components/update_client", "//components/url_fixer", "//components/user_prefs", diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index b92eb55..532712d 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -85,6 +85,7 @@ include_rules = [ "+components/translate/core/browser", "+components/translate/core/common", "+components/ui", + "+components/undo", "+components/update_client", "+components/url_matcher", "+components/user_manager", diff --git a/chrome/browser/android/bookmarks/bookmarks_bridge.cc b/chrome/browser/android/bookmarks/bookmarks_bridge.cc index 9e24ca0..b6e052b 100644 --- a/chrome/browser/android/bookmarks/bookmarks_bridge.cc +++ b/chrome/browser/android/bookmarks/bookmarks_bridge.cc @@ -16,9 +16,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_android.h" #include "chrome/browser/signin/signin_manager_factory.h" -#include "chrome/browser/undo/bookmark_undo_service.h" #include "chrome/browser/undo/bookmark_undo_service_factory.h" -#include "chrome/browser/undo/undo_manager.h" #include "chrome/common/pref_names.h" #include "components/bookmarks/browser/bookmark_match.h" #include "components/bookmarks/browser/bookmark_model.h" @@ -27,6 +25,8 @@ #include "components/bookmarks/common/android/bookmark_type.h" #include "components/query_parser/query_parser.h" #include "components/signin/core/browser/signin_manager.h" +#include "components/undo/bookmark_undo_service.h" +#include "components/undo/undo_manager.h" #include "content/public/browser/browser_thread.h" #include "grit/components_strings.h" #include "jni/BookmarksBridge_jni.h" diff --git a/chrome/browser/bookmarks/bookmark_model_factory.cc b/chrome/browser/bookmarks/bookmark_model_factory.cc index 10c5d14..e0f7e80 100644 --- a/chrome/browser/bookmarks/bookmark_model_factory.cc +++ b/chrome/browser/bookmarks/bookmark_model_factory.cc @@ -15,7 +15,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/startup_task_runner_service.h" #include "chrome/browser/profiles/startup_task_runner_service_factory.h" -#include "chrome/browser/undo/bookmark_undo_service.h" #include "chrome/browser/undo/bookmark_undo_service_factory.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" @@ -23,6 +22,7 @@ #include "components/bookmarks/common/bookmark_pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/undo/bookmark_undo_service.h" #include "content/public/browser/browser_thread.h" using bookmarks::BookmarkModel; diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc index 189aee7..52cd911 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc @@ -22,7 +22,6 @@ #include "chrome/browser/extensions/extension_web_ui.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h" -#include "chrome/browser/undo/bookmark_undo_service.h" #include "chrome/browser/undo/bookmark_undo_service_factory.h" #include "chrome/common/extensions/api/bookmark_manager_private.h" #include "chrome/common/pref_names.h" @@ -32,6 +31,7 @@ #include "components/bookmarks/browser/bookmark_utils.h" #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" #include "components/enhanced_bookmarks/enhanced_bookmark_model.h" +#include "components/undo/bookmark_undo_service.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h index 35a612c..67ca9dc 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h @@ -10,10 +10,10 @@ #include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" -#include "chrome/browser/undo/bookmark_undo_service.h" #include "chrome/browser/undo/bookmark_undo_service_factory.h" #include "components/bookmarks/browser/base_bookmark_model_observer.h" #include "components/bookmarks/browser/bookmark_node_data.h" +#include "components/undo/bookmark_undo_service.h" #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/browser/event_router.h" diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc index be1d351..ad7ab852 100644 --- a/chrome/browser/sync/glue/bookmark_change_processor.cc +++ b/chrome/browser/sync/glue/bookmark_change_processor.cc @@ -18,14 +18,14 @@ #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service.h" -#include "chrome/browser/undo/bookmark_undo_service.h" #include "chrome/browser/undo/bookmark_undo_service_factory.h" -#include "chrome/browser/undo/bookmark_undo_utils.h" #include "components/bookmarks/browser/bookmark_client.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" #include "components/favicon/core/favicon_service.h" #include "components/history/core/browser/history_service.h" +#include "components/undo/bookmark_undo_service.h" +#include "components/undo/bookmark_undo_utils.h" #include "content/public/browser/browser_thread.h" #include "sync/internal_api/public/change_record.h" #include "sync/internal_api/public/read_node.h" diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc index d8b7193..08008ba 100644 --- a/chrome/browser/sync/glue/bookmark_model_associator.cc +++ b/chrome/browser/sync/glue/bookmark_model_associator.cc @@ -19,11 +19,11 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/glue/bookmark_change_processor.h" -#include "chrome/browser/undo/bookmark_undo_service.h" #include "chrome/browser/undo/bookmark_undo_service_factory.h" -#include "chrome/browser/undo/bookmark_undo_utils.h" #include "components/bookmarks/browser/bookmark_client.h" #include "components/bookmarks/browser/bookmark_model.h" +#include "components/undo/bookmark_undo_service.h" +#include "components/undo/bookmark_undo_utils.h" #include "content/public/browser/browser_thread.h" #include "sync/api/sync_error.h" #include "sync/internal_api/public/delete_journal.h" diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc index c3397f0..85d0a2b 100644 --- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc +++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc @@ -18,7 +18,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/browser/undo/bookmark_undo_service.h" #include "chrome/browser/undo/bookmark_undo_service_factory.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" @@ -26,6 +25,7 @@ #include "components/bookmarks/browser/bookmark_client.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" +#include "components/undo/bookmark_undo_service.h" #include "content/public/browser/page_navigator.h" #include "content/public/browser/user_metrics.h" #include "grit/components_strings.h" diff --git a/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc b/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc index 9f126aa..1740a3b 100644 --- a/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc +++ b/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc @@ -6,13 +6,13 @@ #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/undo/bookmark_undo_service.h" #include "chrome/browser/undo/bookmark_undo_service_factory.h" #include "components/bookmarks/browser/bookmark_client.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_node_data.h" #include "components/bookmarks/browser/bookmark_utils.h" #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" +#include "components/undo/bookmark_undo_service.h" #include "ui/base/dragdrop/drag_drop_types.h" using bookmarks::BookmarkModel; diff --git a/chrome/browser/undo/bookmark_undo_service_factory.cc b/chrome/browser/undo/bookmark_undo_service_factory.cc index 0f6cdc7..dd9163a 100644 --- a/chrome/browser/undo/bookmark_undo_service_factory.cc +++ b/chrome/browser/undo/bookmark_undo_service_factory.cc @@ -5,8 +5,8 @@ #include "chrome/browser/undo/bookmark_undo_service_factory.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/undo/bookmark_undo_service.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/undo/bookmark_undo_service.h" // static BookmarkUndoService* BookmarkUndoServiceFactory::GetForProfile( diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 2e09148..3d2331e 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -726,9 +726,6 @@ 'browser/translate/translate_accept_languages_factory.h', 'browser/translate/translate_service.cc', 'browser/translate/translate_service.h', - 'browser/undo/bookmark_renumber_observer.h', - 'browser/undo/undo_manager_observer.h', - 'browser/undo/undo_operation.h', 'browser/update_client/chrome_update_query_params_delegate.cc', 'browser/update_client/chrome_update_query_params_delegate.h', 'browser/upgrade_detector.cc', @@ -2919,14 +2916,8 @@ 'browser/themes/theme_syncable_service.h', ], 'chrome_browser_undo_sources': [ - 'browser/undo/bookmark_undo_service.cc', - 'browser/undo/bookmark_undo_service.h', 'browser/undo/bookmark_undo_service_factory.cc', 'browser/undo/bookmark_undo_service_factory.h', - 'browser/undo/bookmark_undo_utils.cc', - 'browser/undo/bookmark_undo_utils.h', - 'browser/undo/undo_manager.cc', - 'browser/undo/undo_manager.h', ], 'chrome_browser_web_resource_sources': [ 'browser/web_resource/chrome_web_resource_service.cc', @@ -3029,6 +3020,7 @@ '../components/components.gyp:translate_core_browser', '../components/components.gyp:translate_core_common', '../components/components.gyp:update_client', + '../components/components.gyp:undo_component', '../components/components.gyp:url_fixer', '../components/components.gyp:user_prefs', '../components/components.gyp:wallpaper', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index d3497ab..5855ae5 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -1532,9 +1532,6 @@ 'browser/ui/window_sizer/window_sizer_common_unittest.cc', 'browser/ui/window_sizer/window_sizer_unittest.cc', 'browser/ui/zoom/zoom_controller_unittest.cc', - # Bookmark undo is not used on Android. - 'browser/undo/bookmark_undo_service_test.cc', - 'browser/undo/undo_manager_test.cc', # The importer code is not used on Android. 'common/importer/firefox_importer_utils_unittest.cc', # No service process (which also requires multiprocess lock). diff --git a/components/BUILD.gn b/components/BUILD.gn index 2b58643..62c2946 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -95,6 +95,7 @@ group("all_components") { "//components/translate/core/browser", "//components/translate/core/common", "//components/ui/zoom:ui_zoom", + "//components/undo", "//components/update_client", "//components/url_fixer", "//components/url_matcher", @@ -267,6 +268,7 @@ test("components_unittests") { "//components/omnibox:unit_tests", "//components/ownership:unit_tests", "//components/packed_ct_ev_whitelist:unit_tests", + "//components/undo:unit_tests", "//components/update_client:unit_tests", "//components/variations:unit_tests", "//components/web_resource:unit_tests", diff --git a/components/OWNERS b/components/OWNERS index 869139d..ef674a0 100644 --- a/components/OWNERS +++ b/components/OWNERS @@ -256,10 +256,13 @@ per-file translate_strings.grdp=toyoshim@chromium.org per-file startup_metric_utils.gypi=jeremy@chromium.org +per-file undo.gypi=sky@chromium.org +per-file undo.gypi=tom.cassiotis@gmail.com per-file undo_strings.grdp=sky@chromium.org per-file undo_strings.grdp=tom.cassiotis@gmail.com # For refactoring only during componentization of //chrome/browser/undo. +per-file undo.gypi=sdefresne@chromium.org per-file undo_strings.grdp=sdefresne@chromium.org per-file user_manager.gypi=antrim@chromium.org diff --git a/components/components.gyp b/components/components.gyp index 67988d1..d6c5e0a8 100644 --- a/components/components.gyp +++ b/components/components.gyp @@ -65,6 +65,7 @@ 'sync_driver.gypi', 'translate.gypi', 'ui_zoom.gypi', + 'undo.gypi', 'update_client.gypi', 'url_fixer.gypi', 'url_matcher.gypi', diff --git a/components/components_tests.gyp b/components/components_tests.gyp index ad976a6..39b57a2 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -162,6 +162,10 @@ 'favicon/content/content_favicon_driver_unittest.cc', 'favicon/core/favicon_handler_unittest.cc', ], + 'undo_unittest_sources': [ + 'undo/bookmark_undo_service_test.cc', + 'undo/undo_manager_test.cc', + ], # Note: GN tests converted to here, need to do the rest. 'audio_modem_unittest_sources': [ @@ -649,6 +653,7 @@ '<@(suggestions_unittest_sources)', '<@(sync_driver_unittest_sources)', '<@(translate_unittest_sources)', + '<@(undo_unittest_sources)', '<@(update_client_unittest_sources)', '<@(url_fixer_unittest_sources)', '<@(url_matcher_unittest_sources)', @@ -759,6 +764,7 @@ 'components.gyp:translate_core_common', 'components.gyp:translate_core_language_detection', 'components.gyp:ui_zoom', + 'components.gyp:undo_component', 'components.gyp:update_client', 'components.gyp:update_client_test_support', 'components.gyp:url_fixer', diff --git a/components/undo.gypi b/components/undo.gypi new file mode 100644 index 0000000..7039ace --- /dev/null +++ b/components/undo.gypi @@ -0,0 +1,34 @@ +# Copyright 2015 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'targets': [ + { + # GN version: //components/undo + 'target_name': 'undo_component', + 'type': 'static_library', + 'include_dirs': [ + '..', + ], + 'dependencies': [ + '../base/base.gyp:base', + '../ui/base/ui_base.gyp:ui_base', + 'bookmarks_browser', + 'components_strings.gyp:components_strings', + 'keyed_service_core', + ], + 'sources': [ + 'undo/bookmark_renumber_observer.h', + 'undo/bookmark_undo_service.cc', + 'undo/bookmark_undo_service.h', + 'undo/bookmark_undo_utils.cc', + 'undo/bookmark_undo_utils.h', + 'undo/undo_manager.cc', + 'undo/undo_manager.h', + 'undo/undo_manager_observer.h', + 'undo/undo_operation.h', + ], + }, + ], +} diff --git a/components/undo/BUILD.gn b/components/undo/BUILD.gn new file mode 100644 index 0000000..c891cc0 --- /dev/null +++ b/components/undo/BUILD.gn @@ -0,0 +1,39 @@ +# Copyright 2015 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +static_library("undo") { + sources = [ + "bookmark_renumber_observer.h", + "bookmark_undo_service.cc", + "bookmark_undo_service.h", + "bookmark_undo_utils.cc", + "bookmark_undo_utils.h", + "undo_manager.cc", + "undo_manager.h", + "undo_manager_observer.h", + "undo_operation.h", + ] + + deps = [ + "//base", + "//components/bookmarks/browser", + "//components/keyed_service/core", + "//components/strings", + "//ui/base", + ] +} + +source_set("unit_tests") { + testonly = true + sources = [ + "bookmark_undo_service_test.cc", + "undo_manager_test.cc", + ] + + deps = [ + "//components/bookmarks/test", + "//components/undo", + "//testing/gtest", + ] +} diff --git a/components/undo/DEPS b/components/undo/DEPS new file mode 100644 index 0000000..a70c7a8 --- /dev/null +++ b/components/undo/DEPS @@ -0,0 +1,17 @@ +include_rules = [ + # undo component is used on iOS and desktop and thus must not depends on + # system-specific directories. + "-content", + "-ios", + + "+components/bookmarks/browser", + "+components/keyed_service/core", + "+grit/components_strings.h", + "+ui/base", +] + +specific_include_rules = { + ".*_test\.cc": [ + "+components/bookmarks/test", + ], +} diff --git a/components/undo/OWNERS b/components/undo/OWNERS new file mode 100644 index 0000000..08fd84c --- /dev/null +++ b/components/undo/OWNERS @@ -0,0 +1,5 @@ +sky@chromium.org +tom.cassiotis@gmail.com + +# For refactoring only during componentization of //chrome/browser/undo. +sdefresne@chromium.org diff --git a/chrome/browser/undo/bookmark_renumber_observer.h b/components/undo/bookmark_renumber_observer.h index 19f0774..4dc8df0 100644 --- a/chrome/browser/undo/bookmark_renumber_observer.h +++ b/components/undo/bookmark_renumber_observer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UNDO_BOOKMARK_RENUMBER_OBSERVER_H_ -#define CHROME_BROWSER_UNDO_BOOKMARK_RENUMBER_OBSERVER_H_ +#ifndef COMPONENTS_UNDO_BOOKMARK_RENUMBER_OBSERVER_H_ +#define COMPONENTS_UNDO_BOOKMARK_RENUMBER_OBSERVER_H_ #include "base/basictypes.h" @@ -17,4 +17,4 @@ class BookmarkRenumberObserver { virtual ~BookmarkRenumberObserver() {} }; -#endif // CHROME_BROWSER_UNDO_BOOKMARK_RENUMBER_OBSERVER_H_ +#endif // COMPONENTS_UNDO_BOOKMARK_RENUMBER_OBSERVER_H_ diff --git a/chrome/browser/undo/bookmark_undo_service.cc b/components/undo/bookmark_undo_service.cc index a78e5a5..695bacb 100644 --- a/chrome/browser/undo/bookmark_undo_service.cc +++ b/components/undo/bookmark_undo_service.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/undo/bookmark_undo_service.h" +#include "components/undo/bookmark_undo_service.h" -#include "chrome/browser/undo/bookmark_renumber_observer.h" -#include "chrome/browser/undo/undo_operation.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_node_data.h" #include "components/bookmarks/browser/bookmark_utils.h" #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" +#include "components/undo/bookmark_renumber_observer.h" +#include "components/undo/undo_operation.h" #include "grit/components_strings.h" using bookmarks::BookmarkModel; diff --git a/chrome/browser/undo/bookmark_undo_service.h b/components/undo/bookmark_undo_service.h index e988866..8ae2eaf 100644 --- a/chrome/browser/undo/bookmark_undo_service.h +++ b/components/undo/bookmark_undo_service.h @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UNDO_BOOKMARK_UNDO_SERVICE_H_ -#define CHROME_BROWSER_UNDO_BOOKMARK_UNDO_SERVICE_H_ +#ifndef COMPONENTS_UNDO_BOOKMARK_UNDO_SERVICE_H_ +#define COMPONENTS_UNDO_BOOKMARK_UNDO_SERVICE_H_ #include <map> #include "base/scoped_observer.h" -#include "chrome/browser/undo/bookmark_renumber_observer.h" -#include "chrome/browser/undo/undo_manager.h" #include "components/bookmarks/browser/base_bookmark_model_observer.h" #include "components/bookmarks/browser/bookmark_node_data.h" #include "components/keyed_service/core/keyed_service.h" +#include "components/undo/bookmark_renumber_observer.h" +#include "components/undo/undo_manager.h" namespace bookmarks { class BookmarkModel; @@ -77,4 +77,4 @@ class BookmarkUndoService : public bookmarks::BaseBookmarkModelObserver, DISALLOW_COPY_AND_ASSIGN(BookmarkUndoService); }; -#endif // CHROME_BROWSER_UNDO_BOOKMARK_UNDO_SERVICE_H_ +#endif // COMPONENTS_UNDO_BOOKMARK_UNDO_SERVICE_H_ diff --git a/chrome/browser/undo/bookmark_undo_service_test.cc b/components/undo/bookmark_undo_service_test.cc index 10f9983..e97988a 100644 --- a/chrome/browser/undo/bookmark_undo_service_test.cc +++ b/components/undo/bookmark_undo_service_test.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/undo/bookmark_undo_service.h" +#include "components/undo/bookmark_undo_service.h" #include "base/strings/utf_string_conversions.h" #include "components/bookmarks/browser/bookmark_model.h" diff --git a/chrome/browser/undo/bookmark_undo_utils.cc b/components/undo/bookmark_undo_utils.cc index 48dfeac..1539431 100644 --- a/chrome/browser/undo/bookmark_undo_utils.cc +++ b/components/undo/bookmark_undo_utils.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/undo/bookmark_undo_utils.h" +#include "components/undo/bookmark_undo_utils.h" -#include "chrome/browser/undo/bookmark_undo_service.h" -#include "chrome/browser/undo/undo_manager.h" +#include "components/undo/bookmark_undo_service.h" +#include "components/undo/undo_manager.h" // ScopedSuspendBookmarkUndo -------------------------------------------------- diff --git a/chrome/browser/undo/bookmark_undo_utils.h b/components/undo/bookmark_undo_utils.h index 2cf1d5c..987e2728 100644 --- a/chrome/browser/undo/bookmark_undo_utils.h +++ b/components/undo/bookmark_undo_utils.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UNDO_BOOKMARK_UNDO_UTILS_H_ -#define CHROME_BROWSER_UNDO_BOOKMARK_UNDO_UTILS_H_ +#ifndef COMPONENTS_UNDO_BOOKMARK_UNDO_UTILS_H_ +#define COMPONENTS_UNDO_BOOKMARK_UNDO_UTILS_H_ #include "base/basictypes.h" @@ -26,4 +26,4 @@ class ScopedSuspendBookmarkUndo { DISALLOW_COPY_AND_ASSIGN(ScopedSuspendBookmarkUndo); }; -#endif // CHROME_BROWSER_UNDO_BOOKMARK_UNDO_UTILS_H_ +#endif // COMPONENTS_UNDO_BOOKMARK_UNDO_UTILS_H_ diff --git a/chrome/browser/undo/undo_manager.cc b/components/undo/undo_manager.cc index 3caa709..28a8ab2 100644 --- a/chrome/browser/undo/undo_manager.cc +++ b/components/undo/undo_manager.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/undo/undo_manager.h" +#include "components/undo/undo_manager.h" #include "base/auto_reset.h" #include "base/logging.h" -#include "chrome/browser/undo/undo_manager_observer.h" -#include "chrome/browser/undo/undo_operation.h" +#include "components/undo/undo_manager_observer.h" +#include "components/undo/undo_operation.h" #include "grit/components_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/undo/undo_manager.h b/components/undo/undo_manager.h index 443d2d7..ebbe1b4 100644 --- a/chrome/browser/undo/undo_manager.h +++ b/components/undo/undo_manager.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UNDO_UNDO_MANAGER_H_ -#define CHROME_BROWSER_UNDO_UNDO_MANAGER_H_ +#ifndef COMPONENTS_UNDO_UNDO_MANAGER_H_ +#define COMPONENTS_UNDO_UNDO_MANAGER_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" @@ -131,4 +131,4 @@ class UndoManager { DISALLOW_COPY_AND_ASSIGN(UndoManager); }; -#endif // CHROME_BROWSER_UNDO_UNDO_MANAGER_H_ +#endif // COMPONENTS_UNDO_UNDO_MANAGER_H_ diff --git a/chrome/browser/undo/undo_manager_observer.h b/components/undo/undo_manager_observer.h index c61aea2..1eecd66 100644 --- a/chrome/browser/undo/undo_manager_observer.h +++ b/components/undo/undo_manager_observer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UNDO_UNDO_MANAGER_OBSERVER_H_ -#define CHROME_BROWSER_UNDO_UNDO_MANAGER_OBSERVER_H_ +#ifndef COMPONENTS_UNDO_UNDO_MANAGER_OBSERVER_H_ +#define COMPONENTS_UNDO_UNDO_MANAGER_OBSERVER_H_ // Observer for the UndoManager. class UndoManagerObserver { @@ -15,4 +15,4 @@ class UndoManagerObserver { virtual ~UndoManagerObserver() {} }; -#endif // CHROME_BROWSER_UNDO_UNDO_MANAGER_OBSERVER_H_ +#endif // COMPONENTS_UNDO_UNDO_MANAGER_OBSERVER_H_ diff --git a/chrome/browser/undo/undo_manager_test.cc b/components/undo/undo_manager_test.cc index 013b6214..5053572 100644 --- a/chrome/browser/undo/undo_manager_test.cc +++ b/components/undo/undo_manager_test.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "base/auto_reset.h" -#include "chrome/browser/undo/undo_manager.h" -#include "chrome/browser/undo/undo_manager_observer.h" -#include "chrome/browser/undo/undo_operation.h" +#include "components/undo/undo_manager.h" +#include "components/undo/undo_manager_observer.h" +#include "components/undo/undo_operation.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/undo/undo_operation.h b/components/undo/undo_operation.h index b1cbe78..b78f103 100644 --- a/chrome/browser/undo/undo_operation.h +++ b/components/undo/undo_operation.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UNDO_UNDO_OPERATION_H_ -#define CHROME_BROWSER_UNDO_UNDO_OPERATION_H_ +#ifndef COMPONENTS_UNDO_UNDO_OPERATION_H_ +#define COMPONENTS_UNDO_UNDO_OPERATION_H_ // Base class for all undo operations. class UndoOperation { @@ -23,4 +23,4 @@ class UndoOperation { virtual int GetRedoLabelId() const = 0; }; -#endif // CHROME_BROWSER_UNDO_UNDO_OPERATION_H_ +#endif // COMPONENTS_UNDO_UNDO_OPERATION_H_ |