Move bookmarks/core/... to bookmarks/...

chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm

 // Copyright (c) 2012 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.
 
 #include <stack>
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h"
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
-#include "components/bookmarks/core/browser/bookmark_model.h"
+#include "components/bookmarks/browser/bookmark_model.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 @interface BookmarkEditorBaseController ()
 
 // Return the folder tree object for the given path.
 - (BookmarkFolderInfo*)folderForIndexPath:(NSIndexPath*)path;
 
 // (Re)build the folder tree from the BookmarkModel's current state.
@@ skipping 677 matching lines @@
 }
 
 // Implementing isEqual: allows the NSTreeController to preserve the selection
 // and open/shut state of outline items when the data changes.
 - (BOOL)isEqual:(id)other {
   return [other isKindOfClass:[BookmarkFolderInfo class]] &&
       folderNode_ == [(BookmarkFolderInfo*)other folderNode];
 }
 
 @end