diff options
170 files changed, 583 insertions, 331 deletions
diff --git a/chrome/browser/android/bookmarks/bookmarks_bridge.cc b/chrome/browser/android/bookmarks/bookmarks_bridge.cc index d3978e5..a4f2c17 100644 --- a/chrome/browser/android/bookmarks/bookmarks_bridge.cc +++ b/chrome/browser/android/bookmarks/bookmarks_bridge.cc @@ -42,6 +42,7 @@ using base::android::ToJavaIntArray; using bookmarks::android::JavaBookmarkIdCreateBookmarkId; using bookmarks::android::JavaBookmarkIdGetId; using bookmarks::android::JavaBookmarkIdGetType; +using bookmarks::BookmarkModel; using bookmarks::BookmarkType; using content::BrowserThread; diff --git a/chrome/browser/android/bookmarks/bookmarks_bridge.h b/chrome/browser/android/bookmarks/bookmarks_bridge.h index d7e1fed..273bf51 100644 --- a/chrome/browser/android/bookmarks/bookmarks_bridge.h +++ b/chrome/browser/android/bookmarks/bookmarks_bridge.h @@ -180,29 +180,31 @@ class BookmarksBridge : public bookmarks::BaseBookmarkModelObserver, // any of the other callback methods. For example, this is called when // partner bookmarks change. void BookmarkModelChanged() override; - void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override; - void BookmarkModelBeingDeleted(BookmarkModel* model) override; - void BookmarkNodeMoved(BookmarkModel* model, + void BookmarkModelLoaded(bookmarks::BookmarkModel* model, + bool ids_reassigned) override; + void BookmarkModelBeingDeleted(bookmarks::BookmarkModel* model) override; + void BookmarkNodeMoved(bookmarks::BookmarkModel* model, const BookmarkNode* old_parent, int old_index, const BookmarkNode* new_parent, int new_index) override; - void BookmarkNodeAdded(BookmarkModel* model, + void BookmarkNodeAdded(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int index) override; - void BookmarkNodeRemoved(BookmarkModel* model, + void BookmarkNodeRemoved(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) override; - void BookmarkAllUserNodesRemoved(BookmarkModel* model, + void BookmarkAllUserNodesRemoved(bookmarks::BookmarkModel* model, const std::set<GURL>& removed_urls) override; - void BookmarkNodeChanged(BookmarkModel* model, + void BookmarkNodeChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkNodeChildrenReordered(BookmarkModel* model, + void BookmarkNodeChildrenReordered(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void ExtensiveBookmarkChangesBeginning(BookmarkModel* model) override; - void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override; + void ExtensiveBookmarkChangesBeginning( + bookmarks::BookmarkModel* model) override; + void ExtensiveBookmarkChangesEnded(bookmarks::BookmarkModel* model) override; // Override PartnerBookmarksShim::Observer void PartnerShimChanged(PartnerBookmarksShim* shim) override; @@ -211,7 +213,7 @@ class BookmarksBridge : public bookmarks::BaseBookmarkModelObserver, Profile* profile_; JavaObjectWeakGlobalRef weak_java_ref_; - BookmarkModel* bookmark_model_; // weak + bookmarks::BookmarkModel* bookmark_model_; // weak ChromeBookmarkClient* client_; // weak scoped_ptr<bookmarks::ScopedGroupBookmarkActions> grouped_bookmark_actions_; diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc b/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc index acf48d8..304fc64 100644 --- a/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc +++ b/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc @@ -17,6 +17,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" +using bookmarks::BookmarkModel; using testing::_; class MockObserver : public PartnerBookmarksShim::Observer { diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc index 8818328..020ce67 100644 --- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc +++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc @@ -55,6 +55,7 @@ using base::android::AttachCurrentThread; using base::android::ConvertJavaStringToUTF16; using base::android::ConvertUTF8ToJavaString; using base::android::ConvertUTF16ToJavaString; +using bookmarks::BookmarkModel; using metrics::OmniboxEventProto; namespace { diff --git a/chrome/browser/android/provider/bookmark_model_observer_task.cc b/chrome/browser/android/provider/bookmark_model_observer_task.cc index b7e7aa8..94d4edd 100644 --- a/chrome/browser/android/provider/bookmark_model_observer_task.cc +++ b/chrome/browser/android/provider/bookmark_model_observer_task.cc @@ -7,6 +7,7 @@ #include "components/bookmarks/browser/bookmark_model.h" #include "content/public/browser/browser_thread.h" +using bookmarks::BookmarkModel; using content::BrowserThread; BookmarkModelTask::BookmarkModelTask(BookmarkModel* model) diff --git a/chrome/browser/android/provider/bookmark_model_observer_task.h b/chrome/browser/android/provider/bookmark_model_observer_task.h index 18a334c..6438554 100644 --- a/chrome/browser/android/provider/bookmark_model_observer_task.h +++ b/chrome/browser/android/provider/bookmark_model_observer_task.h @@ -14,11 +14,11 @@ // Must not be created from the UI thread. class BookmarkModelTask { public: - explicit BookmarkModelTask(BookmarkModel* model); - BookmarkModel* model() const; + explicit BookmarkModelTask(bookmarks::BookmarkModel* model); + bookmarks::BookmarkModel* model() const; private: - BookmarkModel* model_; + bookmarks::BookmarkModel* model_; DISALLOW_COPY_AND_ASSIGN(BookmarkModelTask); }; @@ -27,33 +27,33 @@ class BookmarkModelTask { class BookmarkModelObserverTask : public BookmarkModelTask, public bookmarks::BookmarkModelObserver { public: - explicit BookmarkModelObserverTask(BookmarkModel* bookmark_model); + explicit BookmarkModelObserverTask(bookmarks::BookmarkModel* bookmark_model); virtual ~BookmarkModelObserverTask(); // bookmarks::BookmarkModelObserver: - virtual void BookmarkModelLoaded(BookmarkModel* model, + virtual void BookmarkModelLoaded(bookmarks::BookmarkModel* model, bool ids_reassigned) override; - virtual void BookmarkNodeMoved(BookmarkModel* model, + virtual void BookmarkNodeMoved(bookmarks::BookmarkModel* model, const BookmarkNode* old_parent, int old_index, const BookmarkNode* new_parent, int new_index) override; - virtual void BookmarkNodeAdded(BookmarkModel* model, + virtual void BookmarkNodeAdded(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int index) override; - virtual void BookmarkNodeRemoved(BookmarkModel* model, + virtual void BookmarkNodeRemoved(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) override; virtual void BookmarkAllUserNodesRemoved( - BookmarkModel* model, + bookmarks::BookmarkModel* model, const std::set<GURL>& removed_urls) override; - virtual void BookmarkNodeChanged(BookmarkModel* model, + virtual void BookmarkNodeChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - virtual void BookmarkNodeFaviconChanged(BookmarkModel* model, + virtual void BookmarkNodeFaviconChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - virtual void BookmarkNodeChildrenReordered(BookmarkModel* model, + virtual void BookmarkNodeChildrenReordered(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; private: diff --git a/chrome/browser/android/provider/chrome_browser_provider.cc b/chrome/browser/android/provider/chrome_browser_provider.cc index 5956023..8944e93 100644 --- a/chrome/browser/android/provider/chrome_browser_provider.cc +++ b/chrome/browser/android/provider/chrome_browser_provider.cc @@ -58,6 +58,7 @@ using base::android::MethodID; using base::android::JavaRef; using base::android::ScopedJavaGlobalRef; using base::android::ScopedJavaLocalRef; +using bookmarks::BookmarkModel; using content::BrowserThread; // After refactoring the following class hierarchy has been created in order diff --git a/chrome/browser/android/provider/chrome_browser_provider.h b/chrome/browser/android/provider/chrome_browser_provider.h index cc2f4b7..8d909eb 100644 --- a/chrome/browser/android/provider/chrome_browser_provider.h +++ b/chrome/browser/android/provider/chrome_browser_provider.h @@ -179,8 +179,10 @@ class ChromeBrowserProvider : public bookmarks::BaseBookmarkModelObserver, // Override bookmarks::BaseBookmarkModelObserver. virtual void BookmarkModelChanged() override; - virtual void ExtensiveBookmarkChangesBeginning(BookmarkModel* model) override; - virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override; + virtual void ExtensiveBookmarkChangesBeginning( + bookmarks::BookmarkModel* model) override; + virtual void ExtensiveBookmarkChangesEnded( + bookmarks::BookmarkModel* model) override; // Deals with updates to the history service. void OnHistoryChanged(); @@ -209,7 +211,7 @@ class ChromeBrowserProvider : public bookmarks::BaseBookmarkModelObserver, // the lifetime of Profile, they are safe to use as long as the Profile is // alive. Profile* profile_; - BookmarkModel* bookmark_model_; + bookmarks::BookmarkModel* bookmark_model_; history::TopSites* top_sites_; FaviconService* favicon_service_; diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/browser/android/signin/signin_manager_android.cc index d9e5042..4e267df 100644 --- a/chrome/browser/android/signin/signin_manager_android.cc +++ b/chrome/browser/android/signin/signin_manager_android.cc @@ -45,6 +45,8 @@ #include "net/url_request/url_request_context_getter.h" #endif +using bookmarks::BookmarkModel; + namespace { // A BrowsingDataRemover::Observer that clears all Profile data and then diff --git a/chrome/browser/autocomplete/bookmark_provider.h b/chrome/browser/autocomplete/bookmark_provider.h index d3fa12a..54ccc97 100644 --- a/chrome/browser/autocomplete/bookmark_provider.h +++ b/chrome/browser/autocomplete/bookmark_provider.h @@ -12,10 +12,10 @@ #include "components/omnibox/autocomplete_provider.h" #include "components/query_parser/snippet.h" -class BookmarkModel; class Profile; namespace bookmarks { +class BookmarkModel; struct BookmarkMatch; } @@ -39,7 +39,8 @@ class BookmarkProvider : public AutocompleteProvider { bool called_due_to_focus) override; // Sets the BookmarkModel for unit tests. - void set_bookmark_model_for_testing(BookmarkModel* bookmark_model) { + void set_bookmark_model_for_testing( + bookmarks::BookmarkModel* bookmark_model) { bookmark_model_ = bookmark_model; } @@ -72,7 +73,7 @@ class BookmarkProvider : public AutocompleteProvider { bool is_url); Profile* profile_; - BookmarkModel* bookmark_model_; + bookmarks::BookmarkModel* bookmark_model_; // Languages used during the URL formatting. std::string languages_; diff --git a/chrome/browser/autocomplete/bookmark_provider_unittest.cc b/chrome/browser/autocomplete/bookmark_provider_unittest.cc index 8995c5f..e3738fc 100644 --- a/chrome/browser/autocomplete/bookmark_provider_unittest.cc +++ b/chrome/browser/autocomplete/bookmark_provider_unittest.cc @@ -24,6 +24,7 @@ #include "testing/gtest/include/gtest/gtest.h" using bookmarks::BookmarkMatch; +using bookmarks::BookmarkModel; // The bookmark corpus against which we will simulate searches. struct BookmarksTestInfo { diff --git a/chrome/browser/autocomplete/history_provider.cc b/chrome/browser/autocomplete/history_provider.cc index 4a4934c..7f4d314 100644 --- a/chrome/browser/autocomplete/history_provider.cc +++ b/chrome/browser/autocomplete/history_provider.cc @@ -19,6 +19,8 @@ #include "components/omnibox/autocomplete_match.h" #include "url/url_util.h" +using bookmarks::BookmarkModel; + void HistoryProvider::DeleteMatch(const AutocompleteMatch& match) { DCHECK(done_); DCHECK(profile_); diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc index b32c2f5..7e1a5ad 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc @@ -29,6 +29,8 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/codec/png_codec.h" +using bookmarks::BookmarkModel; + namespace { const int kIconWidth = 16; diff --git a/chrome/browser/bookmarks/bookmark_model_factory.cc b/chrome/browser/bookmarks/bookmark_model_factory.cc index b0f61ee..07e9ef8 100644 --- a/chrome/browser/bookmarks/bookmark_model_factory.cc +++ b/chrome/browser/bookmarks/bookmark_model_factory.cc @@ -25,6 +25,8 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" +using bookmarks::BookmarkModel; + // static BookmarkModel* BookmarkModelFactory::GetForProfile(Profile* profile) { return static_cast<BookmarkModel*>( diff --git a/chrome/browser/bookmarks/bookmark_model_factory.h b/chrome/browser/bookmarks/bookmark_model_factory.h index 5c98c21..57700f0 100644 --- a/chrome/browser/bookmarks/bookmark_model_factory.h +++ b/chrome/browser/bookmarks/bookmark_model_factory.h @@ -10,15 +10,18 @@ template <typename T> struct DefaultSingletonTraits; -class BookmarkModel; class Profile; +namespace bookmarks { +class BookmarkModel; +} + // Singleton that owns all BookmarkModels and associates them with Profiles. class BookmarkModelFactory : public BrowserContextKeyedServiceFactory { public: - static BookmarkModel* GetForProfile(Profile* profile); + static bookmarks::BookmarkModel* GetForProfile(Profile* profile); - static BookmarkModel* GetForProfileIfExists(Profile* profile); + static bookmarks::BookmarkModel* GetForProfileIfExists(Profile* profile); static BookmarkModelFactory* GetInstance(); diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.cc b/chrome/browser/bookmarks/chrome_bookmark_client.cc index 0e8ddf2..e6a145e 100644 --- a/chrome/browser/bookmarks/chrome_bookmark_client.cc +++ b/chrome/browser/bookmarks/chrome_bookmark_client.cc @@ -25,6 +25,8 @@ #include "policy/policy_constants.h" #include "ui/base/l10n/l10n_util.h" +using bookmarks::BookmarkModel; + namespace { void RunCallbackWithImage( diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.h b/chrome/browser/bookmarks/chrome_bookmark_client.h index eec6698..363a58e 100644 --- a/chrome/browser/bookmarks/chrome_bookmark_client.h +++ b/chrome/browser/bookmarks/chrome_bookmark_client.h @@ -15,19 +15,22 @@ #include "components/bookmarks/browser/bookmark_client.h" #include "components/policy/core/browser/managed_bookmarks_tracker.h" -class BookmarkModel; class GURL; class HistoryService; class HistoryServiceFactory; class Profile; +namespace bookmarks { +class BookmarkModel; +} + class ChromeBookmarkClient : public bookmarks::BookmarkClient, public bookmarks::BaseBookmarkModelObserver { public: explicit ChromeBookmarkClient(Profile* profile); ~ChromeBookmarkClient() override; - void Init(BookmarkModel* model); + void Init(bookmarks::BookmarkModel* model); // KeyedService: void Shutdown() override; @@ -66,14 +69,15 @@ class ChromeBookmarkClient : public bookmarks::BookmarkClient, // bookmarks::BaseBookmarkModelObserver: void BookmarkModelChanged() override; - void BookmarkNodeRemoved(BookmarkModel* model, + void BookmarkNodeRemoved(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) override; - void BookmarkAllUserNodesRemoved(BookmarkModel* model, + void BookmarkAllUserNodesRemoved(bookmarks::BookmarkModel* model, const std::set<GURL>& removed_urls) override; - void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override; + void BookmarkModelLoaded(bookmarks::BookmarkModel* model, + bool ids_reassigned) override; // Helper for GetLoadExtraNodesCallback(). static bookmarks::BookmarkPermanentNodeList LoadExtraNodes( @@ -97,7 +101,7 @@ class ChromeBookmarkClient : public bookmarks::BookmarkClient, // Pointer to the BookmarkModel. Will be non-NULL from the call to Init to // the call to Shutdown. Must be valid for the whole interval. - BookmarkModel* model_; + bookmarks::BookmarkModel* model_; scoped_ptr<policy::ManagedBookmarksTracker> managed_bookmarks_tracker_; BookmarkPermanentNode* managed_node_; diff --git a/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc b/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc index 93d1ffb..d527f45 100644 --- a/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc +++ b/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc @@ -24,6 +24,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" +using bookmarks::BookmarkModel; using testing::Mock; using testing::_; diff --git a/chrome/browser/browser_commands_unittest.cc b/chrome/browser/browser_commands_unittest.cc index b92d173..f6cd805 100644 --- a/chrome/browser/browser_commands_unittest.cc +++ b/chrome/browser/browser_commands_unittest.cc @@ -21,6 +21,7 @@ typedef BrowserWithTestWindowTest BrowserCommandsTest; +using bookmarks::BookmarkModel; using content::OpenURLParams; using content::Referrer; using content::WebContents; 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 2426d31..63f40e7 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 @@ -41,6 +41,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/webui/web_ui_util.h" +using bookmarks::BookmarkModel; using bookmarks::BookmarkNodeData; namespace extensions { 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 359ba88..9adb7b5 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 @@ -34,15 +34,15 @@ class BookmarkManagerPrivateEventRouter : public bookmarks::BaseBookmarkModelObserver { public: BookmarkManagerPrivateEventRouter(content::BrowserContext* browser_context, - BookmarkModel* bookmark_model); + bookmarks::BookmarkModel* bookmark_model); ~BookmarkManagerPrivateEventRouter() override; // bookmarks::BaseBookmarkModelObserver: void BookmarkModelChanged() override; - void BookmarkModelBeingDeleted(BookmarkModel* model) override; - void OnWillChangeBookmarkMetaInfo(BookmarkModel* model, + void BookmarkModelBeingDeleted(bookmarks::BookmarkModel* model) override; + void OnWillChangeBookmarkMetaInfo(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkMetaInfoChanged(BookmarkModel* model, + void BookmarkMetaInfoChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; private: @@ -54,7 +54,7 @@ class BookmarkManagerPrivateEventRouter BookmarkNode::MetaInfoMap prev_meta_info_; content::BrowserContext* browser_context_; - BookmarkModel* bookmark_model_; + bookmarks::BookmarkModel* bookmark_model_; }; class BookmarkManagerPrivateAPI : public BrowserContextKeyedAPI, diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc index 2eee449..6bedfc7 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc @@ -20,6 +20,8 @@ #include "components/bookmarks/test/bookmark_test_helpers.h" #include "components/user_prefs/user_prefs.h" +using bookmarks::BookmarkModel; + // Times out on win syzyasan, http://crbug.com/166026 #if defined(SYZYASAN) #define MAYBE_BookmarkManager DISABLED_BookmarkManager diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc index 2f5a908..501e99a 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc @@ -15,6 +15,8 @@ #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" +using bookmarks::BookmarkModel; + namespace extensions { namespace keys = bookmark_api_constants; diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h index a3a4c28..43557f0 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h +++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h @@ -11,10 +11,13 @@ #include "base/basictypes.h" #include "chrome/common/extensions/api/bookmarks.h" -class BookmarkModel; class BookmarkNode; class ChromeBookmarkClient; +namespace bookmarks { +class BookmarkModel; +} + // Helper functions. namespace extensions { namespace bookmark_api_helpers { @@ -38,7 +41,7 @@ void AddNodeFoldersOnly(ChromeBookmarkClient* client, api::bookmarks::BookmarkTreeNode> >* nodes, bool recurse); -bool RemoveNode(BookmarkModel* model, +bool RemoveNode(bookmarks::BookmarkModel* model, ChromeBookmarkClient* client, int64 id, bool recursive, diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc index 6a57f26..0239876 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc @@ -19,6 +19,8 @@ #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" +using bookmarks::BookmarkModel; + namespace extensions { namespace keys = bookmark_api_constants; diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_apitest.cc b/chrome/browser/extensions/api/bookmarks/bookmark_apitest.cc index 815ba10..fb59a2c 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmark_apitest.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmark_apitest.cc @@ -15,6 +15,8 @@ #include "components/bookmarks/common/bookmark_pref_names.h" #include "components/bookmarks/test/bookmark_test_helpers.h" +using bookmarks::BookmarkModel; + // Flaky on Windows and Linux. http://crbug.com/383452 #if defined(OS_WIN) || defined(OS_LINUX) #define MAYBE_Bookmarks DISABLED_Bookmarks diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index e1fbce3..0389f26 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc @@ -51,6 +51,8 @@ #include "ui/aura/remote_window_tree_host_win.h" #endif +using bookmarks::BookmarkModel; + namespace extensions { namespace keys = bookmark_api_constants; diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h index f9bbb5c..2d4ab19 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h @@ -44,32 +44,34 @@ class BookmarkEventRouter : public bookmarks::BookmarkModelObserver { explicit BookmarkEventRouter(Profile* profile); ~BookmarkEventRouter() override; - // BookmarkModelObserver: - void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override; - void BookmarkModelBeingDeleted(BookmarkModel* model) override; - void BookmarkNodeMoved(BookmarkModel* model, + // bookmarks::BookmarkModelObserver: + void BookmarkModelLoaded(bookmarks::BookmarkModel* model, + bool ids_reassigned) override; + void BookmarkModelBeingDeleted(bookmarks::BookmarkModel* model) override; + void BookmarkNodeMoved(bookmarks::BookmarkModel* model, const BookmarkNode* old_parent, int old_index, const BookmarkNode* new_parent, int new_index) override; - void BookmarkNodeAdded(BookmarkModel* model, + void BookmarkNodeAdded(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int index) override; - void BookmarkNodeRemoved(BookmarkModel* model, + void BookmarkNodeRemoved(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) override; - void BookmarkAllUserNodesRemoved(BookmarkModel* model, + void BookmarkAllUserNodesRemoved(bookmarks::BookmarkModel* model, const std::set<GURL>& removed_urls) override; - void BookmarkNodeChanged(BookmarkModel* model, + void BookmarkNodeChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkNodeFaviconChanged(BookmarkModel* model, + void BookmarkNodeFaviconChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkNodeChildrenReordered(BookmarkModel* model, + void BookmarkNodeChildrenReordered(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void ExtensiveBookmarkChangesBeginning(BookmarkModel* model) override; - void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override; + void ExtensiveBookmarkChangesBeginning( + bookmarks::BookmarkModel* model) override; + void ExtensiveBookmarkChangesEnded(bookmarks::BookmarkModel* model) override; private: // Helper to actually dispatch an event to extension listeners. @@ -77,7 +79,7 @@ class BookmarkEventRouter : public bookmarks::BookmarkModelObserver { scoped_ptr<base::ListValue> event_args); content::BrowserContext* browser_context_; - BookmarkModel* model_; + bookmarks::BookmarkModel* model_; ChromeBookmarkClient* client_; DISALLOW_COPY_AND_ASSIGN(BookmarkEventRouter); @@ -126,7 +128,7 @@ class BookmarksFunction : public ChromeAsyncExtensionFunction, virtual bool RunOnReady() = 0; // Helper to get the BookmarkModel. - BookmarkModel* GetBookmarkModel(); + bookmarks::BookmarkModel* GetBookmarkModel(); // Helper to get the ChromeBookmarkClient. ChromeBookmarkClient* GetChromeBookmarkClient(); @@ -144,7 +146,7 @@ class BookmarksFunction : public ChromeAsyncExtensionFunction, // Helper to create a bookmark node from a CreateDetails object. If a node // can't be created based on the given details, sets error_ and returns NULL. const BookmarkNode* CreateBookmarkNode( - BookmarkModel* model, + bookmarks::BookmarkModel* model, const api::bookmarks::CreateDetails& details, const BookmarkNode::MetaInfoMap* meta_info); @@ -161,7 +163,8 @@ class BookmarksFunction : public ChromeAsyncExtensionFunction, private: // bookmarks::BaseBookmarkModelObserver: void BookmarkModelChanged() override; - void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override; + void BookmarkModelLoaded(bookmarks::BookmarkModel* model, + bool ids_reassigned) override; void RunAndSendResponse(); }; diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc index d25219f9..75212d9 100644 --- a/chrome/browser/extensions/lazy_background_page_apitest.cc +++ b/chrome/browser/extensions/lazy_background_page_apitest.cc @@ -33,6 +33,7 @@ #include "net/test/embedded_test_server/embedded_test_server.h" #include "url/gurl.h" +using bookmarks::BookmarkModel; using extensions::Extension; using extensions::ResultCatcher; diff --git a/chrome/browser/favicon/chrome_favicon_client.cc b/chrome/browser/favicon/chrome_favicon_client.cc index ca34ae3..51db329 100644 --- a/chrome/browser/favicon/chrome_favicon_client.cc +++ b/chrome/browser/favicon/chrome_favicon_client.cc @@ -8,7 +8,7 @@ #include "chrome/browser/favicon/favicon_service_factory.h" #include "components/bookmarks/browser/bookmark_model.h" -class Profile; +using bookmarks::BookmarkModel; ChromeFaviconClient::ChromeFaviconClient(Profile* profile) : profile_(profile) { } diff --git a/chrome/browser/history/android/android_provider_backend_unittest.cc b/chrome/browser/history/android/android_provider_backend_unittest.cc index 4a6f656..1f3dd11 100644 --- a/chrome/browser/history/android/android_provider_backend_unittest.cc +++ b/chrome/browser/history/android/android_provider_backend_unittest.cc @@ -36,6 +36,7 @@ using base::Time; using base::TimeDelta; using base::UTF8ToUTF16; +using bookmarks::BookmarkModel; using content::BrowserThread; namespace history { diff --git a/chrome/browser/history/android/bookmark_model_sql_handler.cc b/chrome/browser/history/android/bookmark_model_sql_handler.cc index 7efbc1a..4625f37 100644 --- a/chrome/browser/history/android/bookmark_model_sql_handler.cc +++ b/chrome/browser/history/android/bookmark_model_sql_handler.cc @@ -14,6 +14,7 @@ #include "content/public/browser/browser_thread.h" using base::Time; +using bookmarks::BookmarkModel; using content::BrowserThread; namespace history { diff --git a/chrome/browser/history/android/bookmark_model_sql_handler.h b/chrome/browser/history/android/bookmark_model_sql_handler.h index ee4ee8e..ff3f7ef 100644 --- a/chrome/browser/history/android/bookmark_model_sql_handler.h +++ b/chrome/browser/history/android/bookmark_model_sql_handler.h @@ -7,9 +7,12 @@ #include "components/history/core/android/sql_handler.h" -class BookmarkModel; class Profile; +namespace bookmarks { +class BookmarkModel; +} + namespace history { class HistoryDatabase; @@ -62,7 +65,7 @@ class BookmarkModelSQLHandler : public SQLHandler { ~Task(); // Returns profile_'s BookmarkModel if the profile_ is valid. - BookmarkModel* GetBookmarkModel(); + bookmarks::BookmarkModel* GetBookmarkModel(); DISALLOW_COPY_AND_ASSIGN(Task); }; diff --git a/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc b/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc index cbbc4e4..482aea9 100644 --- a/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc +++ b/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc @@ -21,10 +21,11 @@ #include "content/public/test/test_utils.h" #include "testing/gtest/include/gtest/gtest.h" -namespace history { - +using bookmarks::BookmarkModel; using content::BrowserThread; +namespace history { + class BookmarkModelSQLHandlerTest : public testing::Test { public: BookmarkModelSQLHandlerTest() diff --git a/chrome/browser/history/chrome_history_client.cc b/chrome/browser/history/chrome_history_client.cc index ea979be..b6a529b 100644 --- a/chrome/browser/history/chrome_history_client.cc +++ b/chrome/browser/history/chrome_history_client.cc @@ -15,6 +15,8 @@ #include "components/bookmarks/browser/bookmark_model.h" #include "content/public/browser/notification_service.h" +using bookmarks::BookmarkModel; + ChromeHistoryClient::ChromeHistoryClient(BookmarkModel* bookmark_model, Profile* profile, history::TopSites* top_sites) diff --git a/chrome/browser/history/chrome_history_client.h b/chrome/browser/history/chrome_history_client.h index fbaffc0..c9cc628 100644 --- a/chrome/browser/history/chrome_history_client.h +++ b/chrome/browser/history/chrome_history_client.h @@ -9,10 +9,13 @@ #include "components/history/core/browser/history_client.h" #include "components/history/core/browser/top_sites_observer.h" -class BookmarkModel; class HistoryService; class Profile; +namespace bookmarks { +class BookmarkModel; +} + namespace history { class TopSites; } @@ -22,7 +25,7 @@ class TopSites; class ChromeHistoryClient : public history::HistoryClient, public history::TopSitesObserver { public: - explicit ChromeHistoryClient(BookmarkModel* bookmark_model, + explicit ChromeHistoryClient(bookmarks::BookmarkModel* bookmark_model, Profile* profile, history::TopSites* top_sites); ~ChromeHistoryClient() override; @@ -43,7 +46,7 @@ class ChromeHistoryClient : public history::HistoryClient, private: // The BookmarkModel, this should outlive ChromeHistoryClient. - BookmarkModel* bookmark_model_; + bookmarks::BookmarkModel* bookmark_model_; Profile* profile_; // The TopSites object is owned by the Profile (see // chrome/browser/profiles/profile_impl.h) diff --git a/chrome/browser/importer/external_process_importer_host.cc b/chrome/browser/importer/external_process_importer_host.cc index 5c9fac2..4700e4b 100644 --- a/chrome/browser/importer/external_process_importer_host.cc +++ b/chrome/browser/importer/external_process_importer_host.cc @@ -17,6 +17,7 @@ #include "components/search_engines/template_url_service.h" #include "content/public/browser/browser_thread.h" +using bookmarks::BookmarkModel; using content::BrowserThread; ExternalProcessImporterHost::ExternalProcessImporterHost() diff --git a/chrome/browser/importer/external_process_importer_host.h b/chrome/browser/importer/external_process_importer_host.h index df3a374..3dc6d4c 100644 --- a/chrome/browser/importer/external_process_importer_host.h +++ b/chrome/browser/importer/external_process_importer_host.h @@ -81,8 +81,9 @@ class ExternalProcessImporterHost virtual void LaunchImportIfReady(); // bookmarks::BaseBookmarkModelObserver: - void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override; - void BookmarkModelBeingDeleted(BookmarkModel* model) override; + void BookmarkModelLoaded(bookmarks::BookmarkModel* model, + bool ids_reassigned) override; + void BookmarkModelBeingDeleted(bookmarks::BookmarkModel* model) override; void BookmarkModelChanged() override; // Called when TemplateURLService has been loaded. diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc index 4894875..f7e8180 100644 --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc @@ -37,6 +37,8 @@ #include "components/password_manager/core/browser/webdata/password_web_data_service_win.h" #endif +using bookmarks::BookmarkModel; + namespace { // Generates a unique folder name. If |folder_name| is not unique, then this diff --git a/chrome/browser/importer/profile_writer_unittest.cc b/chrome/browser/importer/profile_writer_unittest.cc index 8f30d59..e0eed84 100644 --- a/chrome/browser/importer/profile_writer_unittest.cc +++ b/chrome/browser/importer/profile_writer_unittest.cc @@ -23,6 +23,7 @@ #include "testing/gtest/include/gtest/gtest.h" using bookmarks::BookmarkMatch; +using bookmarks::BookmarkModel; using content::BrowserThread; class TestProfileWriter : public ProfileWriter { diff --git a/chrome/browser/profiles/bookmark_model_loaded_observer.cc b/chrome/browser/profiles/bookmark_model_loaded_observer.cc index 015ebac..e6e6ace 100644 --- a/chrome/browser/profiles/bookmark_model_loaded_observer.cc +++ b/chrome/browser/profiles/bookmark_model_loaded_observer.cc @@ -7,6 +7,8 @@ #include "chrome/browser/sync/profile_sync_service_factory.h" #include "components/bookmarks/browser/bookmark_model.h" +using bookmarks::BookmarkModel; + BookmarkModelLoadedObserver::BookmarkModelLoadedObserver(Profile* profile) : profile_(profile) { } diff --git a/chrome/browser/profiles/bookmark_model_loaded_observer.h b/chrome/browser/profiles/bookmark_model_loaded_observer.h index 3484bda..f23e1a6 100644 --- a/chrome/browser/profiles/bookmark_model_loaded_observer.h +++ b/chrome/browser/profiles/bookmark_model_loaded_observer.h @@ -18,8 +18,9 @@ class BookmarkModelLoadedObserver private: void BookmarkModelChanged() override; - void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override; - void BookmarkModelBeingDeleted(BookmarkModel* model) override; + void BookmarkModelLoaded(bookmarks::BookmarkModel* model, + bool ids_reassigned) override; + void BookmarkModelBeingDeleted(bookmarks::BookmarkModel* model) override; Profile* profile_; diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 259c15e..670bbb9 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -159,6 +159,7 @@ using base::Time; using base::TimeDelta; using base::UserMetricsAction; +using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc index 50020ad..ecd8ce6 100644 --- a/chrome/browser/sync/glue/bookmark_change_processor.cc +++ b/chrome/browser/sync/glue/bookmark_change_processor.cc @@ -36,6 +36,7 @@ #include "ui/gfx/favicon_size.h" #include "ui/gfx/image/image_util.h" +using bookmarks::BookmarkModel; using content::BrowserThread; using syncer::ChangeRecord; using syncer::ChangeRecordList; diff --git a/chrome/browser/sync/glue/bookmark_change_processor.h b/chrome/browser/sync/glue/bookmark_change_processor.h index a882eb3..f72ebd2 100644 --- a/chrome/browser/sync/glue/bookmark_change_processor.h +++ b/chrome/browser/sync/glue/bookmark_change_processor.h @@ -42,30 +42,31 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver, // bookmarks::BookmarkModelObserver: // BookmarkModel -> sync API model change application. - void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override; - void BookmarkModelBeingDeleted(BookmarkModel* model) override; - void BookmarkNodeMoved(BookmarkModel* model, + void BookmarkModelLoaded(bookmarks::BookmarkModel* model, + bool ids_reassigned) override; + void BookmarkModelBeingDeleted(bookmarks::BookmarkModel* model) override; + void BookmarkNodeMoved(bookmarks::BookmarkModel* model, const BookmarkNode* old_parent, int old_index, const BookmarkNode* new_parent, int new_index) override; - void BookmarkNodeAdded(BookmarkModel* model, + void BookmarkNodeAdded(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int index) override; - void BookmarkNodeRemoved(BookmarkModel* model, + void BookmarkNodeRemoved(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int index, const BookmarkNode* node, const std::set<GURL>& removed_urls) override; - void BookmarkAllUserNodesRemoved(BookmarkModel* model, + void BookmarkAllUserNodesRemoved(bookmarks::BookmarkModel* model, const std::set<GURL>& removed_urls) override; - void BookmarkNodeChanged(BookmarkModel* model, + void BookmarkNodeChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkMetaInfoChanged(BookmarkModel* model, + void BookmarkMetaInfoChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkNodeFaviconChanged(BookmarkModel* model, + void BookmarkNodeFaviconChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkNodeChildrenReordered(BookmarkModel* model, + void BookmarkNodeChildrenReordered(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; // The change processor implementation, responsible for applying changes from @@ -80,21 +81,19 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver, // Updates the title, URL, creation time and favicon of the bookmark |node| // with data taken from the |sync_node| sync node. - static void UpdateBookmarkWithSyncData( - const syncer::BaseNode& sync_node, - BookmarkModel* model, - const BookmarkNode* node, - Profile* profile); + static void UpdateBookmarkWithSyncData(const syncer::BaseNode& sync_node, + bookmarks::BookmarkModel* model, + const BookmarkNode* node, + Profile* profile); // Creates a bookmark node under the given parent node from the given sync // node. Returns the newly created node. The created node is placed at the // specified index among the parent's children. - static const BookmarkNode* CreateBookmarkNode( - syncer::BaseNode* sync_node, - const BookmarkNode* parent, - BookmarkModel* model, - Profile* profile, - int index); + static const BookmarkNode* CreateBookmarkNode(syncer::BaseNode* sync_node, + const BookmarkNode* parent, + bookmarks::BookmarkModel* model, + Profile* profile, + int index); // Sets the favicon of the given bookmark node from the given sync node. // Returns whether the favicon was set in the bookmark node. @@ -102,7 +101,7 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver, // for the bookmark in question. static bool SetBookmarkFavicon(const syncer::BaseNode* sync_node, const BookmarkNode* bookmark_node, - BookmarkModel* model, + bookmarks::BookmarkModel* model, Profile* profile); // Applies the 1x favicon |bitmap_data| and |icon_url| to |bookmark_node|. @@ -116,7 +115,7 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver, // Sets the favicon of the given sync node from the given bookmark node. static void SetSyncNodeFavicon(const BookmarkNode* bookmark_node, - BookmarkModel* model, + bookmarks::BookmarkModel* model, syncer::WriteNode* sync_node); // Treat the |index|th child of |parent| as a newly added node, and create a @@ -125,7 +124,7 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver, // must already exist and be associated for this call to succeed. Returns // the ID of the just-created node, or if creation fails, kInvalidID. static int64 CreateSyncNode(const BookmarkNode* parent, - BookmarkModel* model, + bookmarks::BookmarkModel* model, int index, syncer::WriteTransaction* trans, BookmarkModelAssociator* associator, @@ -133,7 +132,7 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver, // Update |bookmark_node|'s sync node. static int64 UpdateSyncNode(const BookmarkNode* bookmark_node, - BookmarkModel* model, + bookmarks::BookmarkModel* model, syncer::WriteTransaction* trans, BookmarkModelAssociator* associator, sync_driver::DataTypeErrorHandler* error_handler); @@ -142,7 +141,7 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver, // it's valid. static void UpdateTransactionVersion( int64 new_version, - BookmarkModel* model, + bookmarks::BookmarkModel* model, const std::vector<const BookmarkNode*>& nodes); protected: @@ -179,12 +178,12 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver, // Copy properties (but not position) from |src| to |dst|. static void UpdateSyncNodeProperties(const BookmarkNode* src, - BookmarkModel* model, + bookmarks::BookmarkModel* model, syncer::WriteNode* dst); // Helper function to encode a bookmark's favicon into raw PNG data. static void EncodeFavicon(const BookmarkNode* src, - BookmarkModel* model, + bookmarks::BookmarkModel* model, scoped_refptr<base::RefCountedMemory>* dst); // Remove |sync_node|. It should not have any children @@ -209,7 +208,7 @@ class BookmarkChangeProcessor : public bookmarks::BookmarkModelObserver, // The bookmark model we are processing changes from. Non-NULL when // |running_| is true. - BookmarkModel* bookmark_model_; + bookmarks::BookmarkModel* bookmark_model_; Profile* profile_; diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller.cc b/chrome/browser/sync/glue/bookmark_data_type_controller.cc index 6374a5d..0625334 100644 --- a/chrome/browser/sync/glue/bookmark_data_type_controller.cc +++ b/chrome/browser/sync/glue/bookmark_data_type_controller.cc @@ -16,6 +16,7 @@ #include "components/bookmarks/browser/bookmark_model.h" #include "content/public/browser/browser_thread.h" +using bookmarks::BookmarkModel; using content::BrowserThread; namespace browser_sync { diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller.h b/chrome/browser/sync/glue/bookmark_data_type_controller.h index 0c942de..df870b1 100644 --- a/chrome/browser/sync/glue/bookmark_data_type_controller.h +++ b/chrome/browser/sync/glue/bookmark_data_type_controller.h @@ -37,8 +37,9 @@ class BookmarkDataTypeController : public FrontendDataTypeController, // bookmarks::BaseBookmarkModelObserver: void BookmarkModelChanged() override; - void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override; - void BookmarkModelBeingDeleted(BookmarkModel* model) override; + void BookmarkModelLoaded(bookmarks::BookmarkModel* model, + bool ids_reassigned) override; + void BookmarkModelBeingDeleted(bookmarks::BookmarkModel* model) override; // Helper that returns true iff both the bookmark model and the history // service have finished loading. @@ -50,7 +51,7 @@ class BookmarkDataTypeController : public FrontendDataTypeController, ScopedObserver<HistoryService, HistoryServiceObserver> history_service_observer_; - ScopedObserver<BookmarkModel, BaseBookmarkModelObserver> + ScopedObserver<bookmarks::BookmarkModel, BaseBookmarkModelObserver> bookmark_model_observer_; DISALLOW_COPY_AND_ASSIGN(BookmarkDataTypeController); diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc index 4f526ed..2cd6cfb 100644 --- a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc @@ -34,6 +34,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +using bookmarks::BookmarkModel; using browser_sync::BookmarkDataTypeController; using sync_driver::ChangeProcessorMock; using sync_driver::DataTypeController; diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc index ea98f9d..eb8ae19 100644 --- a/chrome/browser/sync/glue/bookmark_model_associator.cc +++ b/chrome/browser/sync/glue/bookmark_model_associator.cc @@ -36,6 +36,7 @@ #include "sync/util/cryptographer.h" #include "sync/util/data_type_histogram.h" +using bookmarks::BookmarkModel; using content::BrowserThread; namespace browser_sync { diff --git a/chrome/browser/sync/glue/bookmark_model_associator.h b/chrome/browser/sync/glue/bookmark_model_associator.h index 199c83e..2820597 100644 --- a/chrome/browser/sync/glue/bookmark_model_associator.h +++ b/chrome/browser/sync/glue/bookmark_model_associator.h @@ -17,10 +17,13 @@ #include "components/sync_driver/model_associator.h" #include "sync/internal_api/public/util/unrecoverable_error_handler.h" -class BookmarkModel; class BookmarkNode; class Profile; +namespace bookmarks { +class BookmarkModel; +} + namespace syncer { class BaseNode; class BaseTransaction; @@ -41,7 +44,7 @@ class BookmarkModelAssociator // expect the mobile bookmarks permanent folder to be created. // Should be set to true only by mobile clients. BookmarkModelAssociator( - BookmarkModel* bookmark_model, + bookmarks::BookmarkModel* bookmark_model, Profile* profile_, syncer::UserShare* user_share, sync_driver::DataTypeErrorHandler* unrecoverable_error_handler, @@ -146,7 +149,7 @@ class BookmarkModelAssociator syncer::SyncMergeResult* local_merge_result, syncer::SyncMergeResult* syncer_merge_result) const; - BookmarkModel* bookmark_model_; + bookmarks::BookmarkModel* bookmark_model_; Profile* profile_; syncer::UserShare* user_share_; sync_driver::DataTypeErrorHandler* unrecoverable_error_handler_; diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc index e59d538..2d0edd8 100644 --- a/chrome/browser/sync/profile_sync_components_factory_impl.cc +++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc @@ -103,6 +103,7 @@ #include "components/wifi_sync/wifi_credential_syncable_service_factory.h" #endif +using bookmarks::BookmarkModel; using browser_sync::AutofillDataTypeController; using browser_sync::AutofillProfileDataTypeController; using browser_sync::BookmarkChangeProcessor; diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc index 9b9928b..9ad8578 100644 --- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc @@ -49,6 +49,7 @@ namespace browser_sync { +using bookmarks::BookmarkModel; using syncer::BaseNode; using testing::_; using testing::InvokeWithoutArgs; diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc index 270f57e..e85eea5 100644 --- a/chrome/browser/sync/test/integration/bookmarks_helper.cc +++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc @@ -42,6 +42,8 @@ #include "ui/base/models/tree_node_iterator.h" #include "ui/gfx/image/image_skia.h" +using bookmarks::BookmarkModel; + namespace { // History task which runs all pending tasks on the history thread and diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.h b/chrome/browser/sync/test/integration/bookmarks_helper.h index 036a390..6d9a7c3 100644 --- a/chrome/browser/sync/test/integration/bookmarks_helper.h +++ b/chrome/browser/sync/test/integration/bookmarks_helper.h @@ -20,7 +20,7 @@ class GURL; namespace bookmarks_helper { // Used to access the bookmark model within a particular sync profile. -BookmarkModel* GetBookmarkModel(int index) WARN_UNUSED_RESULT; +bookmarks::BookmarkModel* GetBookmarkModel(int index) WARN_UNUSED_RESULT; // Used to access the bookmark bar within a particular sync profile. const BookmarkNode* GetBookmarkBarNode(int index) WARN_UNUSED_RESULT; @@ -35,7 +35,7 @@ const BookmarkNode* GetSyncedBookmarksNode(int index) WARN_UNUSED_RESULT; const BookmarkNode* GetManagedNode(int index) WARN_UNUSED_RESULT; // Used to access the bookmarks within the verifier sync profile. -BookmarkModel* GetVerifierBookmarkModel() WARN_UNUSED_RESULT; +bookmarks::BookmarkModel* GetVerifierBookmarkModel() WARN_UNUSED_RESULT; // Adds a URL with address |url| and title |title| to the bookmark bar of // profile |profile|. Returns a pointer to the node that was added. diff --git a/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc index d587930..86c165f 100644 --- a/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc @@ -14,6 +14,7 @@ #include "sync/test/fake_server/fake_server_verifier.h" #include "ui/base/layout.h" +using bookmarks::BookmarkModel; using bookmarks_helper::AddFolder; using bookmarks_helper::AddURL; using bookmarks_helper::CountBookmarksWithTitlesMatching; diff --git a/chrome/browser/ui/app_list/search/omnibox_result.cc b/chrome/browser/ui/app_list/search/omnibox_result.cc index 1d5a9c1e..dbcf4e5 100644 --- a/chrome/browser/ui/app_list/search/omnibox_result.cc +++ b/chrome/browser/ui/app_list/search/omnibox_result.cc @@ -17,6 +17,8 @@ #include "url/gurl.h" #include "url/url_canon.h" +using bookmarks::BookmarkModel; + namespace app_list { namespace { diff --git a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc index 035f7e0..ef1291fd 100644 --- a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc @@ -27,6 +27,8 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +using bookmarks::BookmarkModel; + namespace { const char kPersistBookmarkURL[] = "http://www.cnn.com/"; const char kPersistBookmarkTitle[] = "CNN"; diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h index a1e4b38..55b4bd60 100644 --- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h +++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h @@ -97,7 +97,7 @@ class BookmarkContextMenuController content::PageNavigator* navigator_; const BookmarkNode* parent_; std::vector<const BookmarkNode*> selection_; - BookmarkModel* model_; + bookmarks::BookmarkModel* model_; scoped_ptr<ui::SimpleMenuModel> menu_model_; DISALLOW_COPY_AND_ASSIGN(BookmarkContextMenuController); diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc index accdfaf..204a9c8 100644 --- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc @@ -26,6 +26,7 @@ #include "ui/base/clipboard/clipboard.h" using base::ASCIIToUTF16; +using bookmarks::BookmarkModel; using content::BrowserThread; using content::OpenURLParams; using content::PageNavigator; diff --git a/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc b/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc index db782f8..ac7a8b8 100644 --- a/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc +++ b/chrome/browser/ui/bookmarks/bookmark_drag_drop.cc @@ -15,6 +15,7 @@ #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" #include "ui/base/dragdrop/drag_drop_types.h" +using bookmarks::BookmarkModel; using bookmarks::BookmarkNodeData; namespace chrome { diff --git a/chrome/browser/ui/bookmarks/bookmark_editor.cc b/chrome/browser/ui/bookmarks/bookmark_editor.cc index ba94617..b7c7877 100644 --- a/chrome/browser/ui/bookmarks/bookmark_editor.cc +++ b/chrome/browser/ui/bookmarks/bookmark_editor.cc @@ -6,6 +6,9 @@ #include "base/logging.h" #include "chrome/grit/generated_resources.h" +#include "components/bookmarks/browser/bookmark_model.h" + +using bookmarks::BookmarkModel; namespace { diff --git a/chrome/browser/ui/bookmarks/bookmark_editor.h b/chrome/browser/ui/bookmarks/bookmark_editor.h index 421c773..04fe4aa 100644 --- a/chrome/browser/ui/bookmarks/bookmark_editor.h +++ b/chrome/browser/ui/bookmarks/bookmark_editor.h @@ -9,12 +9,16 @@ #include <vector> #include "base/strings/string16.h" -#include "components/bookmarks/browser/bookmark_model.h" +#include "components/bookmarks/browser/bookmark_node.h" #include "ui/gfx/native_widget_types.h" class GURL; class Profile; +namespace bookmarks { +class BookmarkModel; +} + // Small, cross platform interface that shows the correct platform specific // bookmark editor dialog. class BookmarkEditor { @@ -108,7 +112,7 @@ class BookmarkEditor { // explicitly being added, returns a pointer to the new node that was created. // Otherwise the return value is identically |node|. static const BookmarkNode* ApplyEditsWithNoFolderChange( - BookmarkModel* model, + bookmarks::BookmarkModel* model, const BookmarkNode* parent, const EditDetails& details, const base::string16& new_title, @@ -119,7 +123,7 @@ class BookmarkEditor { // is explicitly being added, returns a pointer to the new node that was // created. Otherwise the return value is identically |node|. static const BookmarkNode* ApplyEditsWithPossibleFolderChange( - BookmarkModel* model, + bookmarks::BookmarkModel* model, const BookmarkNode* new_parent, const EditDetails& details, const base::string16& new_title, diff --git a/chrome/browser/ui/bookmarks/bookmark_editor_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_editor_unittest.cc index 6a7a115..ca3c8ee 100644 --- a/chrome/browser/ui/bookmarks/bookmark_editor_unittest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_editor_unittest.cc @@ -5,10 +5,12 @@ #include "chrome/browser/ui/bookmarks/bookmark_editor.h" #include "base/strings/utf_string_conversions.h" +#include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/test/test_bookmark_client.h" #include "testing/gtest/include/gtest/gtest.h" using base::ASCIIToUTF16; +using bookmarks::BookmarkModel; namespace { diff --git a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc index 4ed873e..92009f4 100644 --- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc +++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc @@ -18,6 +18,8 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" +using bookmarks::BookmarkModel; + namespace { bool IsNTPWebUI(content::WebContents* web_contents) { diff --git a/chrome/browser/ui/bookmarks/bookmark_tab_helper.h b/chrome/browser/ui/bookmarks/bookmark_tab_helper.h index 5e840ab..3982070 100644 --- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.h +++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.h @@ -67,19 +67,19 @@ class BookmarkTabHelper // Overridden from bookmarks::BaseBookmarkModelObserver: void BookmarkModelChanged() override; - void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override; - void BookmarkNodeAdded(BookmarkModel* model, + void BookmarkModelLoaded(bookmarks::BookmarkModel* model, + bool ids_reassigned) override; + void BookmarkNodeAdded(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int index) override; - void BookmarkNodeRemoved(BookmarkModel* model, + void BookmarkNodeRemoved(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) override; - void BookmarkAllUserNodesRemoved(BookmarkModel* model, + void BookmarkAllUserNodesRemoved(bookmarks::BookmarkModel* model, const std::set<GURL>& removed_urls) override; - - void BookmarkNodeChanged(BookmarkModel* model, + void BookmarkNodeChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; // Overridden from content::WebContentsObserver: @@ -93,7 +93,7 @@ class BookmarkTabHelper // Whether the current URL is starred. bool is_starred_; - BookmarkModel* bookmark_model_; + bookmarks::BookmarkModel* bookmark_model_; // Our delegate, to notify when the url starred changed. BookmarkTabHelperDelegate* delegate_; diff --git a/chrome/browser/ui/bookmarks/bookmark_ui_utils_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_ui_utils_unittest.cc index 40fab46..fe684e8 100644 --- a/chrome/browser/ui/bookmarks/bookmark_ui_utils_unittest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_ui_utils_unittest.cc @@ -13,6 +13,7 @@ #if !defined(OS_ANDROID) && !defined(OS_IOS) using base::ASCIIToUTF16; +using bookmarks::BookmarkModel; namespace { diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc index bd3e029..f05929d 100644 --- a/chrome/browser/ui/bookmarks/bookmark_utils.cc +++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc @@ -38,6 +38,8 @@ #include "extensions/common/extension_set.h" #endif +using bookmarks::BookmarkModel; + namespace chrome { int num_bookmark_urls_before_prompting = 15; diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc index 6ca6c53..4c279d5 100644 --- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc +++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc @@ -11,6 +11,8 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/combobox_model_observer.h" +using bookmarks::BookmarkModel; + namespace { // Max number of most recently used folders. diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h index d6869df..2f22ec8 100644 --- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h +++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h @@ -13,9 +13,12 @@ #include "components/bookmarks/browser/bookmark_model_observer.h" #include "ui/base/models/combobox_model.h" -class BookmarkModel; class BookmarkNode; +namespace bookmarks { +class BookmarkModel; +} + // Model for the combobox showing the list of folders to choose from. The // list always contains the Bookmarks Bar, Other Bookmarks and the parent // folder. The list also contains an extra item that shows the text @@ -23,7 +26,8 @@ class BookmarkNode; class RecentlyUsedFoldersComboModel : public ui::ComboboxModel, public bookmarks::BookmarkModelObserver { public: - RecentlyUsedFoldersComboModel(BookmarkModel* model, const BookmarkNode* node); + RecentlyUsedFoldersComboModel(bookmarks::BookmarkModel* model, + const BookmarkNode* node); ~RecentlyUsedFoldersComboModel() override; // Overridden from ui::ComboboxModel: @@ -35,32 +39,33 @@ class RecentlyUsedFoldersComboModel : public ui::ComboboxModel, void RemoveObserver(ui::ComboboxModelObserver* observer) override; // Overriden from bookmarks::BookmarkModelObserver: - void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override; - void BookmarkModelBeingDeleted(BookmarkModel* model) override; - void BookmarkNodeMoved(BookmarkModel* model, + void BookmarkModelLoaded(bookmarks::BookmarkModel* model, + bool ids_reassigned) override; + void BookmarkModelBeingDeleted(bookmarks::BookmarkModel* model) override; + void BookmarkNodeMoved(bookmarks::BookmarkModel* model, const BookmarkNode* old_parent, int old_index, const BookmarkNode* new_parent, int new_index) override; - void BookmarkNodeAdded(BookmarkModel* model, + void BookmarkNodeAdded(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int index) override; - void OnWillRemoveBookmarks(BookmarkModel* model, + void OnWillRemoveBookmarks(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int old_index, const BookmarkNode* node) override; - void BookmarkNodeRemoved(BookmarkModel* model, + void BookmarkNodeRemoved(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) override; - void BookmarkNodeChanged(BookmarkModel* model, + void BookmarkNodeChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkNodeFaviconChanged(BookmarkModel* model, + void BookmarkNodeFaviconChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkNodeChildrenReordered(BookmarkModel* model, + void BookmarkNodeChildrenReordered(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkAllUserNodesRemoved(BookmarkModel* model, + void BookmarkAllUserNodesRemoved(bookmarks::BookmarkModel* model, const std::set<GURL>& removed_urls) override; // If necessary this function moves |node| into the corresponding folder for @@ -77,7 +82,7 @@ class RecentlyUsedFoldersComboModel : public ui::ComboboxModel, struct Item; std::vector<Item> items_; - BookmarkModel* bookmark_model_; + bookmarks::BookmarkModel* bookmark_model_; // The index of the original parent folder. int node_parent_index_; diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc index 9e5cf01..42db38c 100644 --- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc +++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc @@ -15,6 +15,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/models/combobox_model_observer.h" +using bookmarks::BookmarkModel; using content::BrowserThread; // Implementation of ComboboxModelObserver that records when @@ -31,7 +32,7 @@ class TestComboboxModelObserver : public ui::ComboboxModelObserver { return changed; } - // ComboboxModelObserver: + // ui::ComboboxModelObserver: void OnComboboxModelChanged(ui::ComboboxModel* model) override { changed_ = true; } diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc index 3f82239..6d1ea2d7 100644 --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc @@ -109,6 +109,7 @@ const char kOsOverrideForTabletSite[] = "Linux; Android 4.0.3"; } using base::UserMetricsAction; +using bookmarks::BookmarkModel; using content::NavigationController; using content::NavigationEntry; using content::OpenURLParams; diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h b/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h index f49ada6..d5e8fb3 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h +++ b/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h @@ -14,8 +14,6 @@ #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" #include "testing/platform_test.h" -class BookmarkModel; - // The fake object that acts as our app's delegate, useful for testing purposes. @interface FakeAppDelegate : AppController { @public diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.mm b/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.mm index cf8e64c..f56722c 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.mm +++ b/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.mm @@ -9,6 +9,8 @@ #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/test/bookmark_test_helpers.h" +using bookmarks::BookmarkModel; + @implementation FakeAppDelegate @synthesize test = test_; diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm b/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm index 9da6b0b..e0db2eb 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm @@ -13,6 +13,8 @@ #include "components/bookmarks/browser/bookmark_model.h" #include "url/gurl.h" +using bookmarks::BookmarkModel; + @implementation BookmarkFolderAppleScript - (NSArray*)bookmarkFolders { diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.mm b/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.mm index 8387aa5..210bc70 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/bookmark_item_applescript.mm @@ -9,6 +9,8 @@ #import "chrome/browser/ui/cocoa/applescript/error_applescript.h" #include "components/bookmarks/browser/bookmark_model.h" +using bookmarks::BookmarkModel; + @interface BookmarkItemAppleScript() @property (nonatomic, copy) NSString* tempURL; @end diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.h b/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.h index 0f1db68..d92e786 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.h +++ b/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.h @@ -9,9 +9,12 @@ #import "chrome/browser/ui/cocoa/applescript/element_applescript.h" -class BookmarkModel; class BookmarkNode; +namespace bookmarks { +class BookmarkModel; +} + // Contains all the elements that are common to both a bookmark folder and // bookmark item. @interface BookmarkNodeAppleScript : ElementAppleScript { @@ -41,7 +44,7 @@ class BookmarkNode; - (NSNumber*)index; // Returns the bookmark model of the browser, returns NULL if there is an error. -- (BookmarkModel*)bookmarkModel; +- (bookmarks::BookmarkModel*)bookmarkModel; @end diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm b/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm index cc3810d..1d45904 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm @@ -15,6 +15,8 @@ #import "chrome/browser/ui/cocoa/applescript/error_applescript.h" #include "components/bookmarks/browser/bookmark_model.h" +using bookmarks::BookmarkModel; + @interface BookmarkNodeAppleScript() @property (nonatomic, copy) NSString* tempTitle; @end diff --git a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm index c75abe5..1736b9f 100644 --- a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm @@ -18,6 +18,8 @@ #import "chrome/browser/ui/cocoa/applescript/window_applescript.h" #include "components/bookmarks/browser/bookmark_model.h" +using bookmarks::BookmarkModel; + @implementation BrowserCrApplication (AppleScriptAdditions) - (NSArray*)appleScriptWindows { diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm index eaa036d..7079ad7 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm @@ -15,6 +15,7 @@ #include "content/public/browser/web_contents.h" #include "ui/base/l10n/l10n_util_mac.h" +using bookmarks::BookmarkModel; using content::WebContents; @implementation BookmarkAllTabsController diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm index be43b36..417b84b 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm @@ -15,6 +15,7 @@ #include "testing/platform_test.h" using base::ASCIIToUTF16; +using bookmarks::BookmarkModel; @interface BookmarkAllTabsControllerOverride : BookmarkAllTabsController @end diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h index eb46a6b..587a3b4 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h @@ -23,39 +23,41 @@ class BookmarkBarBridge : public bookmarks::BookmarkModelObserver { public: BookmarkBarBridge(Profile* profile, BookmarkBarController* controller, - BookmarkModel* model); + bookmarks::BookmarkModel* model); ~BookmarkBarBridge() override; // bookmarks::BookmarkModelObserver: - void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override; - void BookmarkModelBeingDeleted(BookmarkModel* model) override; - void BookmarkNodeMoved(BookmarkModel* model, + void BookmarkModelLoaded(bookmarks::BookmarkModel* model, + bool ids_reassigned) override; + void BookmarkModelBeingDeleted(bookmarks::BookmarkModel* model) override; + void BookmarkNodeMoved(bookmarks::BookmarkModel* model, const BookmarkNode* old_parent, int old_index, const BookmarkNode* new_parent, int new_index) override; - void BookmarkNodeAdded(BookmarkModel* model, + void BookmarkNodeAdded(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int index) override; - void BookmarkNodeRemoved(BookmarkModel* model, + void BookmarkNodeRemoved(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) override; - void BookmarkAllUserNodesRemoved(BookmarkModel* model, + void BookmarkAllUserNodesRemoved(bookmarks::BookmarkModel* model, const std::set<GURL>& removed_urls) override; - void BookmarkNodeChanged(BookmarkModel* model, + void BookmarkNodeChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkNodeFaviconChanged(BookmarkModel* model, + void BookmarkNodeFaviconChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkNodeChildrenReordered(BookmarkModel* model, + void BookmarkNodeChildrenReordered(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void ExtensiveBookmarkChangesBeginning(BookmarkModel* model) override; - void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override; + void ExtensiveBookmarkChangesBeginning( + bookmarks::BookmarkModel* model) override; + void ExtensiveBookmarkChangesEnded(bookmarks::BookmarkModel* model) override; private: BookmarkBarController* controller_; // weak; owns me - BookmarkModel* model_; // weak; it is owned by a Profile. + bookmarks::BookmarkModel* model_; // weak; it is owned by a Profile. bool batch_mode_; // Needed to react to kShowAppsShortcutInBookmarkBar changes. diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm index e1ecc42..4c689e3f 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm @@ -11,6 +11,7 @@ #include "chrome/common/pref_names.h" #include "components/bookmarks/browser/bookmark_model.h" +using bookmarks::BookmarkModel; BookmarkBarBridge::BookmarkBarBridge(Profile* profile, BookmarkBarController* controller, diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm index 5695167..c46c0c3 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm @@ -12,6 +12,8 @@ #include "testing/platform_test.h" #include "url/gurl.h" +using bookmarks::BookmarkModel; + // TODO(jrg): use OCMock. namespace { diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h index d25f92b..79b1250 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h @@ -25,7 +25,6 @@ @class BookmarkButtonCell; @class BookmarkFolderTarget; @class BookmarkContextMenuCocoaController; -class BookmarkModel; class BookmarkNode; class Browser; class ChromeBookmarkClient; @@ -36,6 +35,8 @@ class ThemeProvider; namespace bookmarks { +class BookmarkModel; + // Magic numbers from Cole // TODO(jrg): create an objc-friendly version of bookmark_bar_constants.h? @@ -170,8 +171,8 @@ willAnimateFromState:(BookmarkBar::State)oldState BOOL isAnimationRunning_; Browser* browser_; // weak; owned by its window - BookmarkModel* bookmarkModel_; // weak; part of the profile owned by the - // top-level Browser object. + bookmarks::BookmarkModel* bookmarkModel_; // weak; part of the profile owned + // by the top-level Browser object. ChromeBookmarkClient* bookmarkClient_; // Our initial view width, which is applied in awakeFromNib. @@ -369,20 +370,20 @@ willAnimateFromState:(BookmarkBar::State)oldState // Redirects from BookmarkBarBridge, the C++ object which glues us to // the rest of Chromium. Internal to BookmarkBarController. @interface BookmarkBarController(BridgeRedirect) -- (void)loaded:(BookmarkModel*)model; -- (void)beingDeleted:(BookmarkModel*)model; -- (void)nodeAdded:(BookmarkModel*)model +- (void)loaded:(bookmarks::BookmarkModel*)model; +- (void)beingDeleted:(bookmarks::BookmarkModel*)model; +- (void)nodeAdded:(bookmarks::BookmarkModel*)model parent:(const BookmarkNode*)oldParent index:(int)index; -- (void)nodeChanged:(BookmarkModel*)model +- (void)nodeChanged:(bookmarks::BookmarkModel*)model node:(const BookmarkNode*)node; -- (void)nodeMoved:(BookmarkModel*)model +- (void)nodeMoved:(bookmarks::BookmarkModel*)model oldParent:(const BookmarkNode*)oldParent oldIndex:(int)oldIndex newParent:(const BookmarkNode*)newParent newIndex:(int)newIndex; -- (void)nodeRemoved:(BookmarkModel*)model +- (void)nodeRemoved:(bookmarks::BookmarkModel*)model parent:(const BookmarkNode*)oldParent index:(int)index; -- (void)nodeFaviconLoaded:(BookmarkModel*)model +- (void)nodeFaviconLoaded:(bookmarks::BookmarkModel*)model node:(const BookmarkNode*)node; -- (void)nodeChildrenReordered:(BookmarkModel*)model +- (void)nodeChildrenReordered:(bookmarks::BookmarkModel*)model node:(const BookmarkNode*)node; @end diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index 10d15b1..b361d72 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -64,6 +64,7 @@ #include "ui/resources/grit/ui_resources.h" using base::UserMetricsAction; +using bookmarks::BookmarkModel; using bookmarks::BookmarkNodeData; using content::OpenURLParams; using content::Referrer; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm index 3c8872c..06ef982 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm @@ -41,6 +41,7 @@ #include "ui/gfx/image/image_skia.h" using base::ASCIIToUTF16; +using bookmarks::BookmarkModel; // Unit tests don't need time-consuming asynchronous animations. @interface BookmarkBarControllerTestable : BookmarkBarController { diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm index d01aa4c..d3fb1df 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm @@ -23,6 +23,7 @@ #include "components/bookmarks/browser/bookmark_node_data.h" #include "ui/base/theme_provider.h" +using bookmarks::BookmarkModel; using bookmarks::BookmarkNodeData; using bookmarks::kBookmarkBarMenuCornerRadius; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm index e1864cc..e80e3c8 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm @@ -25,6 +25,7 @@ #include <cmath> using base::ASCIIToUTF16; +using bookmarks::BookmarkModel; namespace { diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.mm index 721c047..62eb536 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.mm @@ -13,6 +13,7 @@ #include "content/public/browser/user_metrics.h" using base::UserMetricsAction; +using bookmarks::BookmarkModel; #import "third_party/mozilla/NSPasteboard+Utils.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm index 7725d6e..a4a8290 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm @@ -23,6 +23,8 @@ #import "third_party/ocmock/OCMock/OCMock.h" #import "third_party/ocmock/ocmock_extensions.h" +using bookmarks::BookmarkModel; + // Allows us to verify BookmarkBarFolderView. @interface BookmarkBarFolderView(TestingAPI) diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm index 5df8493..01e9ec3 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm @@ -20,6 +20,7 @@ #import "third_party/mozilla/NSPasteboard+Utils.h" using base::UserMetricsAction; +using bookmarks::BookmarkModel; @interface BookmarkBarView (Private) - (void)themeDidChangeNotification:(NSNotification*)aNotification; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa_unittest.mm index 19163f6..735106d 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa_unittest.mm @@ -22,11 +22,15 @@ #include "testing/platform_test.h" #import "third_party/mozilla/NSPasteboard+Utils.h" +using bookmarks::BookmarkModel; + namespace { + // Some values used for mocks and fakes. const CGFloat kFakeIndicatorPos = 7.0; const NSPoint kPoint = {10, 10}; -}; + +} // namespace // Fake DraggingInfo, fake BookmarkBarController, fake NSPasteboard... @interface FakeBookmarkDraggingInfo : NSObject { diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h index ec51591..06cbf22 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h @@ -9,12 +9,15 @@ #import "chrome/browser/ui/cocoa/base_bubble_controller.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h" -class BookmarkModel; class BookmarkNode; class ChromeBookmarkClient; @class BookmarkBubbleController; @class BookmarkSyncPromoController; +namespace bookmarks { +class BookmarkModel; +} + // Controller for the bookmark bubble. The bookmark bubble is a // bubble that pops up when clicking on the STAR next to the URL to // add or remove it as a bookmark. This bubble allows for editing of @@ -24,7 +27,7 @@ class ChromeBookmarkClient; // |client_|, |model_| and |node_| are weak and owned by the current browser's // profile. ChromeBookmarkClient* client_; // weak - BookmarkModel* model_; // weak + bookmarks::BookmarkModel* model_; // weak const BookmarkNode* node_; // weak // The bookmark node whose button we asked to pulse. @@ -54,7 +57,7 @@ class ChromeBookmarkClient; // init routine. Closing of the window happens implicitly on dealloc. - (id)initWithParentWindow:(NSWindow*)parentWindow client:(ChromeBookmarkClient*)client - model:(BookmarkModel*)model + model:(bookmarks::BookmarkModel*)model node:(const BookmarkNode*)node alreadyBookmarked:(BOOL)alreadyBookmarked; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm index 5b69f5b..fd1187b 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm @@ -24,6 +24,7 @@ #include "ui/base/l10n/l10n_util_mac.h" using base::UserMetricsAction; +using bookmarks::BookmarkModel; // An object to represent the ChooseAnotherFolder item in the pop up. @interface ChooseAnotherFolder : NSObject diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm index 03110ce..066ef60 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm @@ -27,6 +27,7 @@ #include "testing/platform_test.h" using base::ASCIIToUTF16; +using bookmarks::BookmarkModel; using content::WebContents; // Watch for bookmark pulse notifications so we can confirm they were sent. diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_button.h index 02bf77a..83c6fbe 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button.h @@ -9,11 +9,14 @@ @class BookmarkBarFolderController; @class BookmarkButton; -class BookmarkModel; class BookmarkNode; @class BrowserWindowController; class ThemeService; +namespace bookmarks { +class BookmarkModel; +} + // Protocol for a BookmarkButton's delegate, responsible for doing // things on behalf of a bookmark button. @protocol BookmarkButtonDelegate @@ -72,7 +75,7 @@ class ThemeService; - (void)closeBookmarkFolder:(id)sender; // Return the bookmark model for this controller. -- (BookmarkModel*)bookmarkModel; +- (bookmarks::BookmarkModel*)bookmarkModel; // Perform drag enter/exit operations, such as hover-open and hover-close. - (BOOL)draggingAllowed:(id<NSDraggingInfo>)info; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm index c4c4a0f..ce1bbcd 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm @@ -16,6 +16,8 @@ #include "ui/gfx/image/image.h" #include "ui/resources/grit/ui_resources.h" +using bookmarks::BookmarkModel; + // Simple class to remember how many mouseEntered: and mouseExited: // calls it gets. Only used by BookmarkMouseForwarding but placed // at the top of the file to keep it outside the anon namespace. diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm index 927efd0..b5d4ee0 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm @@ -14,6 +14,8 @@ #include "testing/platform_test.h" #import "ui/events/test/cocoa_test_event_utils.h" +using bookmarks::BookmarkModel; + // Fake BookmarkButton delegate to get a pong on mouse entered/exited @interface FakeButtonDelegate : NSObject<BookmarkButtonDelegate> { @public diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.h index 50c394a..e459085 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.h @@ -14,7 +14,6 @@ @class BookmarkBarController; class BookmarkContextMenuController; class BookmarkContextMenuDelegateBridge; -class BookmarkModel; class BookmarkNode; @class MenuController; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.mm index b5d5ad6..95358c7 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.mm @@ -13,6 +13,8 @@ #include "components/bookmarks/browser/bookmark_model.h" #import "ui/base/cocoa/menu_controller.h" +using bookmarks::BookmarkModel; + @interface BookmarkContextMenuCocoaController (Private) - (void)willExecuteCommand:(int)command; @end diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm index d3ab907..89847bf 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm @@ -22,6 +22,8 @@ #include "components/bookmarks/browser/bookmark_node_data.h" #include "ui/base/dragdrop/drag_drop_types.h" +using bookmarks::BookmarkModel; + namespace { // Make a drag image from the drop data. diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h index ac681f3..263bff5 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h @@ -13,9 +13,12 @@ #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h" class BookmarkEditorBaseControllerBridge; -class BookmarkModel; @class BookmarkTreeBrowserCell; +namespace bookmarks { +class BookmarkModel; +} + // A base controller class for bookmark creation and editing dialogs which // present the current bookmark folder structure in a tree view. Do not // instantiate this controller directly -- use one of its derived classes. @@ -116,7 +119,7 @@ class BookmarkModel; - (BOOL)okEnabled; // Accessors -- (BookmarkModel*)bookmarkModel; +- (bookmarks::BookmarkModel*)bookmarkModel; - (Profile*)profile; - (const BookmarkNode*)parentNode; - (const GURL&)url; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm index 82a875c..b5b6ce8 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm @@ -25,6 +25,7 @@ #include "ui/base/l10n/l10n_util_mac.h" using bookmarks::BookmarkExpandedStateTracker; +using bookmarks::BookmarkModel; @interface BookmarkEditorBaseController () diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm index 306c02d..509ea6c 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm @@ -20,6 +20,7 @@ using base::ASCIIToUTF16; using bookmarks::BookmarkExpandedStateTracker; +using bookmarks::BookmarkModel; class BookmarkEditorBaseControllerTest : public CocoaProfileTest { public: diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm index f2afb56..acc905f 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm @@ -15,6 +15,7 @@ #include "components/user_prefs/user_prefs.h" using bookmarks::BookmarkExpandedStateTracker; +using bookmarks::BookmarkModel; @interface BookmarkEditorController (Private) diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm index 1250070..e5479dc 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm @@ -17,6 +17,7 @@ #include "testing/platform_test.h" using base::ASCIIToUTF16; +using bookmarks::BookmarkModel; class BookmarkEditorControllerTest : public CocoaProfileTest { public: diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm index 2cd9235..eac0de4 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm @@ -15,6 +15,8 @@ #import "third_party/ocmock/OCMock/OCMock.h" #include "third_party/ocmock/gtest_support.h" +using bookmarks::BookmarkModel; + @interface OCMockObject(PreventRetainCycle) - (void)clearRecordersAndExpectations; @end diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h index 407597a..778127e 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h @@ -40,28 +40,29 @@ class BookmarkMenuBridge : public bookmarks::BookmarkModelObserver, ~BookmarkMenuBridge() override; // bookmarks::BookmarkModelObserver: - void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override; - void BookmarkModelBeingDeleted(BookmarkModel* model) override; - void BookmarkNodeMoved(BookmarkModel* model, + void BookmarkModelLoaded(bookmarks::BookmarkModel* model, + bool ids_reassigned) override; + void BookmarkModelBeingDeleted(bookmarks::BookmarkModel* model) override; + void BookmarkNodeMoved(bookmarks::BookmarkModel* model, const BookmarkNode* old_parent, int old_index, const BookmarkNode* new_parent, int new_index) override; - void BookmarkNodeAdded(BookmarkModel* model, + void BookmarkNodeAdded(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int index) override; - void BookmarkNodeRemoved(BookmarkModel* model, + void BookmarkNodeRemoved(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) override; - void BookmarkAllUserNodesRemoved(BookmarkModel* model, + void BookmarkAllUserNodesRemoved(bookmarks::BookmarkModel* model, const std::set<GURL>& removed_urls) override; - void BookmarkNodeChanged(BookmarkModel* model, + void BookmarkNodeChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkNodeFaviconChanged(BookmarkModel* model, + void BookmarkNodeFaviconChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkNodeChildrenReordered(BookmarkModel* model, + void BookmarkNodeChildrenReordered(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; // MainMenuItem: @@ -75,7 +76,7 @@ class BookmarkMenuBridge : public bookmarks::BookmarkModelObserver, void UpdateSubMenu(NSMenu* bookmark_menu); // I wish I had a "friend @class" construct. - BookmarkModel* GetBookmarkModel(); + bookmarks::BookmarkModel* GetBookmarkModel(); Profile* GetProfile(); // Return the Bookmark menu. diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm index 194c94e..e0f938b 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm @@ -24,6 +24,8 @@ #include "ui/gfx/image/image.h" #include "ui/resources/grit/ui_resources.h" +using bookmarks::BookmarkModel; + BookmarkMenuBridge::BookmarkMenuBridge(Profile* profile, NSMenu* menu) : menuIsValid_(false), profile_(profile), diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm index 6f3af0e..10b1822 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm @@ -19,6 +19,7 @@ #include "ui/base/l10n/l10n_util.h" using base::ASCIIToUTF16; +using bookmarks::BookmarkModel; class TestBookmarkMenuBridge : public BookmarkMenuBridge { public: diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm index 8ed41ba..4f02ab6 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm @@ -13,6 +13,8 @@ #include "components/bookmarks/browser/bookmark_utils.h" #include "testing/gtest/include/gtest/gtest.h" +using bookmarks::BookmarkModel; + @interface FakeBookmarkMenuController : BookmarkMenuCocoaController { @public const BookmarkNode* nodes_[2]; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h index 4e0ce9e..7d7f186 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h @@ -36,7 +36,7 @@ class BookmarkModelObserverForCocoa : public bookmarks::BookmarkModelObserver { // When a |model| changes, or an observed node within it does, call a // |callback|. - BookmarkModelObserverForCocoa(BookmarkModel* model, + BookmarkModelObserverForCocoa(bookmarks::BookmarkModel* model, ChangeCallback callback); ~BookmarkModelObserverForCocoa() override; @@ -46,41 +46,43 @@ class BookmarkModelObserverForCocoa : public bookmarks::BookmarkModelObserver { void StopObservingNode(const BookmarkNode* node); // bookmarks::BookmarkModelObserver: - void BookmarkModelBeingDeleted(BookmarkModel* model) override; - void BookmarkNodeMoved(BookmarkModel* model, + void BookmarkModelBeingDeleted(bookmarks::BookmarkModel* model) override; + void BookmarkNodeMoved(bookmarks::BookmarkModel* model, const BookmarkNode* old_parent, int old_index, const BookmarkNode* new_parent, int new_index) override; - void BookmarkNodeRemoved(BookmarkModel* model, + void BookmarkNodeRemoved(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) override; - void BookmarkAllUserNodesRemoved(BookmarkModel* model, + void BookmarkAllUserNodesRemoved(bookmarks::BookmarkModel* model, const std::set<GURL>& removed_urls) override; - void BookmarkNodeChanged(BookmarkModel* model, + void BookmarkNodeChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; // Some notifications we don't care about, but by being pure virtual // in the base class we must implement them. - void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override { - } - void BookmarkNodeAdded(BookmarkModel* model, + void BookmarkModelLoaded(bookmarks::BookmarkModel* model, + bool ids_reassigned) override {} + void BookmarkNodeAdded(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int index) override {} - void BookmarkNodeFaviconChanged(BookmarkModel* model, + void BookmarkNodeFaviconChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override {} - void BookmarkNodeChildrenReordered(BookmarkModel* model, + void BookmarkNodeChildrenReordered(bookmarks::BookmarkModel* model, const BookmarkNode* node) override {} - void ExtensiveBookmarkChangesBeginning(BookmarkModel* model) override {} + void ExtensiveBookmarkChangesBeginning( + bookmarks::BookmarkModel* model) override {} - void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override {} + void ExtensiveBookmarkChangesEnded(bookmarks::BookmarkModel* model) override { + } private: - BookmarkModel* model_; // Weak; it is owned by a Profile. + bookmarks::BookmarkModel* model_; // Weak; it is owned by a Profile. std::set<const BookmarkNode*> nodes_; // Weak items owned by a BookmarkModel. base::mac::ScopedBlock<ChangeCallback> callback_; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.mm index 64ff66c..0368e58 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.mm @@ -4,6 +4,8 @@ #include "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h" +using bookmarks::BookmarkModel; + BookmarkModelObserverForCocoa::BookmarkModelObserverForCocoa( BookmarkModel* model, ChangeCallback callback) { diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm index ca18a59..d480f80 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm @@ -11,6 +11,8 @@ #import "chrome/browser/ui/cocoa/cocoa_profile_test.h" #include "chrome/test/base/testing_profile.h" +using bookmarks::BookmarkModel; + namespace { class BookmarkModelObserverForCocoaTest : public CocoaProfileTest { diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm index ae9af4f..5439737 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm @@ -13,6 +13,8 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_mac.h" +using bookmarks::BookmarkModel; + @implementation BookmarkNameFolderController // Common initializer (private). diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm index 02ce8da..69fffc7 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm @@ -16,6 +16,7 @@ #include "testing/platform_test.h" using base::ASCIIToUTF16; +using bookmarks::BookmarkModel; class BookmarkNameFolderControllerTest : public CocoaProfileTest { }; diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm index 21b052e..6b99369 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm @@ -97,6 +97,7 @@ #include "ui/base/l10n/l10n_util_mac.h" #include "ui/gfx/mac/scoped_ns_disable_screen_updates.h" +using bookmarks::BookmarkModel; using l10n_util::GetStringUTF16; using l10n_util::GetNSStringWithFixup; using l10n_util::GetNSStringFWithFixup; diff --git a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm index 3401079f..dafee4c 100644 --- a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm +++ b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm @@ -21,6 +21,7 @@ #include "components/bookmarks/test/bookmark_test_helpers.h" #include "extensions/common/switches.h" +using bookmarks::BookmarkModel; using content::OpenURLParams; using content::Referrer; diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc index 237acc1..b2f07fb 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc @@ -69,6 +69,7 @@ #include "ui/gfx/image/image.h" #include "url/url_util.h" +using bookmarks::BookmarkModel; using metrics::OmniboxEventProto; using predictors::AutocompleteActionPredictor; diff --git a/chrome/browser/ui/omnibox/omnibox_popup_model.cc b/chrome/browser/ui/omnibox/omnibox_popup_model.cc index d1d697f..c43b961 100644 --- a/chrome/browser/ui/omnibox/omnibox_popup_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_popup_model.cc @@ -22,6 +22,8 @@ #include "ui/gfx/geometry/rect.h" #include "ui/gfx/image/image.h" +using bookmarks::BookmarkModel; + /////////////////////////////////////////////////////////////////////////////// // OmniboxPopupModel diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc index 5e1fb6c..9688f28 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc @@ -53,6 +53,7 @@ using base::ASCIIToUTF16; using base::UTF16ToUTF8; using base::Time; using base::TimeDelta; +using bookmarks::BookmarkModel; namespace { diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc index 2f7a131..4337e17 100644 --- a/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc +++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc @@ -30,6 +30,8 @@ #include "extensions/common/extension_set.h" #endif +using bookmarks::BookmarkModel; + namespace { const int kHistoryEntriesBeforeNewProfilePrompt = 10; diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc index c573776..e425e87 100644 --- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc +++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc @@ -50,6 +50,8 @@ #include "extensions/common/permissions/permission_set.h" #endif +using bookmarks::BookmarkModel; + namespace { template<typename T> diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index d8b0f7d..0e87819 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -89,6 +89,7 @@ #include "ui/views/window/non_client_view.h" using base::UserMetricsAction; +using bookmarks::BookmarkModel; using bookmarks::BookmarkNodeData; using content::OpenURLParams; using content::PageNavigator; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h index 3ad4c5b..9eb766d 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h @@ -31,12 +31,15 @@ class BookmarkBarViewObserver; class BookmarkBarViewTestHelper; class BookmarkContextMenu; -class BookmarkModel; class Browser; class BrowserView; class ChromeBookmarkClient; class Profile; +namespace bookmarks { +class BookmarkModel; +} + namespace content { class PageNavigator; } @@ -205,28 +208,29 @@ class BookmarkBarView : public views::AccessiblePaneView, void OnBookmarkBubbleHidden() override; // bookmarks::BookmarkModelObserver: - void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override; - void BookmarkModelBeingDeleted(BookmarkModel* model) override; - void BookmarkNodeMoved(BookmarkModel* model, + void BookmarkModelLoaded(bookmarks::BookmarkModel* model, + bool ids_reassigned) override; + void BookmarkModelBeingDeleted(bookmarks::BookmarkModel* model) override; + void BookmarkNodeMoved(bookmarks::BookmarkModel* model, const BookmarkNode* old_parent, int old_index, const BookmarkNode* new_parent, int new_index) override; - void BookmarkNodeAdded(BookmarkModel* model, + void BookmarkNodeAdded(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int index) override; - void BookmarkNodeRemoved(BookmarkModel* model, + void BookmarkNodeRemoved(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) override; - void BookmarkAllUserNodesRemoved(BookmarkModel* model, + void BookmarkAllUserNodesRemoved(bookmarks::BookmarkModel* model, const std::set<GURL>& removed_urls) override; - void BookmarkNodeChanged(BookmarkModel* model, + void BookmarkNodeChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkNodeChildrenReordered(BookmarkModel* model, + void BookmarkNodeChildrenReordered(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkNodeFaviconChanged(BookmarkModel* model, + void BookmarkNodeFaviconChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; // views::DragController: @@ -315,19 +319,20 @@ class BookmarkBarView : public views::AccessiblePaneView, // Implementation for BookmarkNodeAddedImpl. Returns true if LayoutAndPaint() // is required. - bool BookmarkNodeAddedImpl(BookmarkModel* model, + bool BookmarkNodeAddedImpl(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int index); // Implementation for BookmarkNodeRemoved. Returns true if LayoutAndPaint() is // required. - bool BookmarkNodeRemovedImpl(BookmarkModel* model, + bool BookmarkNodeRemovedImpl(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int index); // If the node is a child of the root node, the button is updated // appropriately. - void BookmarkNodeChangedImpl(BookmarkModel* model, const BookmarkNode* node); + void BookmarkNodeChangedImpl(bookmarks::BookmarkModel* model, + const BookmarkNode* node); // Shows the menu used during drag and drop for the specified node. void ShowDropFolderForNode(const BookmarkNode* node); @@ -389,7 +394,7 @@ class BookmarkBarView : public views::AccessiblePaneView, // BookmarkModel that owns the entries and folders that are shown in this // view. This is owned by the Profile. - BookmarkModel* model_; + bookmarks::BookmarkModel* model_; // ChromeBookmarkClient. This is owned by the Profile. ChromeBookmarkClient* client_; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index f17050c..211669e 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc @@ -48,6 +48,7 @@ #include "ui/views/widget/widget.h" using base::ASCIIToUTF16; +using bookmarks::BookmarkModel; using content::BrowserThread; using content::OpenURLParams; using content::PageNavigator; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc index 68af4d2..3f5c439 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc @@ -33,6 +33,7 @@ #include "ui/views/widget/widget.h" using base::UserMetricsAction; +using bookmarks::BookmarkModel; using views::ColumnSet; using views::GridLayout; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc index c27b8e8..25dae71 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc @@ -16,6 +16,8 @@ #include "components/bookmarks/test/bookmark_test_helpers.h" #include "components/signin/core/browser/signin_manager.h" +using bookmarks::BookmarkModel; + namespace { const char kTestBookmarkURL[] = "http://www.google.com"; } // namespace diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc index 1178598..0240d79 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc @@ -35,6 +35,7 @@ #endif using base::ASCIIToUTF16; +using bookmarks::BookmarkModel; using content::BrowserThread; using content::OpenURLParams; using content::PageNavigator; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc index 8a477a7..93c8cbf 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc @@ -15,6 +15,8 @@ #include "ui/views/drag_utils.h" #include "ui/views/widget/widget.h" +using bookmarks::BookmarkModel; + namespace chrome { void DragBookmarks(Profile* profile, diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index f6ec805..53fbab8 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -39,6 +39,7 @@ #include "url/gurl.h" using bookmarks::BookmarkExpandedStateTracker; +using bookmarks::BookmarkModel; using views::GridLayout; namespace { diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h index 5777f82..8adafa7 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h @@ -128,28 +128,28 @@ class BookmarkEditorView : public BookmarkEditor, // bookmarks::BookmarkModelObserver: // Any structural change results in resetting the tree model. - void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override { - } - void BookmarkNodeMoved(BookmarkModel* model, + void BookmarkModelLoaded(bookmarks::BookmarkModel* model, + bool ids_reassigned) override {} + void BookmarkNodeMoved(bookmarks::BookmarkModel* model, const BookmarkNode* old_parent, int old_index, const BookmarkNode* new_parent, int new_index) override; - void BookmarkNodeAdded(BookmarkModel* model, + void BookmarkNodeAdded(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int index) override; - void BookmarkNodeRemoved(BookmarkModel* model, + void BookmarkNodeRemoved(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int index, const BookmarkNode* node, const std::set<GURL>& removed_urls) override; - void BookmarkAllUserNodesRemoved(BookmarkModel* model, + void BookmarkAllUserNodesRemoved(bookmarks::BookmarkModel* model, const std::set<GURL>& removed_urls) override; - void BookmarkNodeChanged(BookmarkModel* model, + void BookmarkNodeChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override {} - void BookmarkNodeChildrenReordered(BookmarkModel* model, + void BookmarkNodeChildrenReordered(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkNodeFaviconChanged(BookmarkModel* model, + void BookmarkNodeFaviconChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override {} // Resets the model of the tree and updates the various buttons appropriately. @@ -253,7 +253,7 @@ class BookmarkEditorView : public BookmarkEditor, scoped_ptr<views::MenuRunner> context_menu_runner_; // Mode used to create nodes from. - BookmarkModel* bb_model_; + bookmarks::BookmarkModel* bb_model_; // If true, we're running the menu for the bookmark bar or other bookmarks // nodes. diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc index e428f13..777ad5a 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc @@ -23,6 +23,7 @@ using base::ASCIIToUTF16; using base::UTF8ToUTF16; using base::Time; using base::TimeDelta; +using bookmarks::BookmarkModel; using content::BrowserThread; // Base class for bookmark editor tests. Creates a BookmarkModel and populates diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc index 7bfb725..83585a5 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc @@ -30,6 +30,7 @@ #include "ui/views/widget/widget.h" using base::UserMetricsAction; +using bookmarks::BookmarkModel; using bookmarks::BookmarkNodeData; using content::PageNavigator; using views::MenuItemView; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h index e0612ae..e06443a 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h @@ -76,7 +76,7 @@ class BookmarkMenuDelegate : public bookmarks::BaseBookmarkModelObserver, // the first child of |node| to show in the menu. void SetActiveMenu(const BookmarkNode* node, int start_index); - BookmarkModel* GetBookmarkModel(); + bookmarks::BookmarkModel* GetBookmarkModel(); ChromeBookmarkClient* GetChromeBookmarkClient(); // Returns the menu. @@ -123,7 +123,7 @@ class BookmarkMenuDelegate : public bookmarks::BaseBookmarkModelObserver, // BookmarkModelObserver methods. void BookmarkModelChanged() override; - void BookmarkNodeFaviconChanged(BookmarkModel* model, + void BookmarkNodeFaviconChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; // BookmarkContextMenu::Observer methods. diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc index 6ec2fb6..87e3f73 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc @@ -17,6 +17,7 @@ #include "ui/views/controls/menu/submenu_view.h" using base::ASCIIToUTF16; +using bookmarks::BookmarkModel; class BookmarkMenuDelegateTest : public BrowserWithTestWindowTest { public: diff --git a/chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc b/chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc index b003c51..2ee7c5c 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc @@ -19,6 +19,8 @@ #include "ui/views/view.h" #include "ui/views/widget/widget.h" +using bookmarks::BookmarkModel; + namespace { class ToolbarViewTest : public InProcessBrowserTest { diff --git a/chrome/browser/ui/views/toolbar/wrench_menu.cc b/chrome/browser/ui/views/toolbar/wrench_menu.cc index eac7619..4128198 100644 --- a/chrome/browser/ui/views/toolbar/wrench_menu.cc +++ b/chrome/browser/ui/views/toolbar/wrench_menu.cc @@ -62,6 +62,7 @@ #include "ui/views/widget/widget.h" using base::UserMetricsAction; +using bookmarks::BookmarkModel; using content::WebContents; using ui::MenuModel; using views::CustomButton; diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc index dce6fdc..c234dec 100644 --- a/chrome/browser/ui/webui/history_ui.cc +++ b/chrome/browser/ui/webui/history_ui.cc @@ -79,6 +79,8 @@ #include "chrome/browser/ui/webui/ntp/ntp_login_handler.h" #endif +using bookmarks::BookmarkModel; + static const char kStringsJsFile[] = "strings.js"; static const char kHistoryJsFile[] = "history.js"; static const char kOtherDevicesJsFile[] = "other_devices.js"; diff --git a/chrome/browser/ui/webui/history_ui.h b/chrome/browser/ui/webui/history_ui.h index a5593c1..2048409 100644 --- a/chrome/browser/ui/webui/history_ui.h +++ b/chrome/browser/ui/webui/history_ui.h @@ -18,10 +18,13 @@ #include "content/public/browser/web_ui_controller.h" #include "content/public/browser/web_ui_message_handler.h" -class BookmarkModel; class ProfileSyncService; class SupervisedUserService; +namespace bookmarks { +class BookmarkModel; +} + // The handler for Javascript messages related to the "history" view. class BrowsingHistoryHandler : public content::WebUIMessageHandler, public content::NotificationObserver { @@ -51,7 +54,7 @@ class BrowsingHistoryHandler : public content::WebUIMessageHandler, // Converts the entry to a DictionaryValue to be owned by the caller. scoped_ptr<base::DictionaryValue> ToValue( - BookmarkModel* bookmark_model, + bookmarks::BookmarkModel* bookmark_model, SupervisedUserService* supervised_user_service, const ProfileSyncService* sync_service) const; diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc index 025860d..2301d87 100644 --- a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc +++ b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc @@ -30,6 +30,8 @@ #include "content/public/browser/web_ui.h" #include "mojo/common/common_type_converters.h" +using bookmarks::BookmarkModel; + namespace mojo { template <> diff --git a/chrome/browser/undo/bookmark_undo_service.cc b/chrome/browser/undo/bookmark_undo_service.cc index d763bdb..c195729 100644 --- a/chrome/browser/undo/bookmark_undo_service.cc +++ b/chrome/browser/undo/bookmark_undo_service.cc @@ -15,6 +15,7 @@ #include "components/bookmarks/browser/bookmark_utils.h" #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" +using bookmarks::BookmarkModel; using bookmarks::BookmarkNodeData; namespace { diff --git a/chrome/browser/undo/bookmark_undo_service.h b/chrome/browser/undo/bookmark_undo_service.h index 944ea95..c44da964 100644 --- a/chrome/browser/undo/bookmark_undo_service.h +++ b/chrome/browser/undo/bookmark_undo_service.h @@ -34,27 +34,29 @@ class BookmarkUndoService : public bookmarks::BaseBookmarkModelObserver, private: // bookmarks::BaseBookmarkModelObserver: void BookmarkModelChanged() override {} - void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override; - void BookmarkModelBeingDeleted(BookmarkModel* model) override; - void BookmarkNodeMoved(BookmarkModel* model, + void BookmarkModelLoaded(bookmarks::BookmarkModel* model, + bool ids_reassigned) override; + void BookmarkModelBeingDeleted(bookmarks::BookmarkModel* model) override; + void BookmarkNodeMoved(bookmarks::BookmarkModel* model, const BookmarkNode* old_parent, int old_index, const BookmarkNode* new_parent, int new_index) override; - void BookmarkNodeAdded(BookmarkModel* model, + void BookmarkNodeAdded(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int index) override; - void OnWillRemoveBookmarks(BookmarkModel* model, + void OnWillRemoveBookmarks(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int old_index, const BookmarkNode* node) override; - void OnWillRemoveAllUserBookmarks(BookmarkModel* model) override; - void OnWillChangeBookmarkNode(BookmarkModel* model, + void OnWillRemoveAllUserBookmarks(bookmarks::BookmarkModel* model) override; + void OnWillChangeBookmarkNode(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void OnWillReorderBookmarkNode(BookmarkModel* model, + void OnWillReorderBookmarkNode(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void GroupedBookmarkChangesBeginning(BookmarkModel* model) override; - void GroupedBookmarkChangesEnded(BookmarkModel* model) override; + void GroupedBookmarkChangesBeginning( + bookmarks::BookmarkModel* model) override; + void GroupedBookmarkChangesEnded(bookmarks::BookmarkModel* model) override; // BookmarkRenumberObserver: void OnBookmarkRenumbered(int64 old_id, int64 new_id) override; diff --git a/chrome/browser/undo/bookmark_undo_service_test.cc b/chrome/browser/undo/bookmark_undo_service_test.cc index 072004a..c7ee5fa 100644 --- a/chrome/browser/undo/bookmark_undo_service_test.cc +++ b/chrome/browser/undo/bookmark_undo_service_test.cc @@ -14,6 +14,7 @@ #include "testing/gtest/include/gtest/gtest.h" using base::ASCIIToUTF16; +using bookmarks::BookmarkModel; namespace { diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc index 00ac808..d42e0c7 100644 --- a/chrome/test/base/testing_profile.cc +++ b/chrome/test/base/testing_profile.cc @@ -104,6 +104,7 @@ #endif using base::Time; +using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; using testing::NiceMock; diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmarks/browser/bookmark_codec.h index f9da4dc..761ee48 100644 --- a/components/bookmarks/browser/bookmark_codec.h +++ b/components/bookmarks/browser/bookmark_codec.h @@ -13,8 +13,6 @@ #include "base/strings/string16.h" #include "components/bookmarks/browser/bookmark_node.h" -class BookmarkModel; - namespace base { class DictionaryValue; class ListValue; @@ -23,6 +21,8 @@ class Value; namespace bookmarks { +class BookmarkModel; + // BookmarkCodec is responsible for encoding and decoding the BookmarkModel // into JSON values. The encoded values are written to disk via the // BookmarkStorage. diff --git a/components/bookmarks/browser/bookmark_expanded_state_tracker.h b/components/bookmarks/browser/bookmark_expanded_state_tracker.h index c960b23..9efc1d0 100644 --- a/components/bookmarks/browser/bookmark_expanded_state_tracker.h +++ b/components/bookmarks/browser/bookmark_expanded_state_tracker.h @@ -9,12 +9,13 @@ #include "components/bookmarks/browser/base_bookmark_model_observer.h" -class BookmarkModel; class BookmarkNode; class PrefService; namespace bookmarks { +class BookmarkModel; + // BookmarkExpandedStateTracker is used to track a set of expanded nodes. The // nodes are persisted in preferences. If an expanded node is removed from the // model BookmarkExpandedStateTracker removes the node. diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc index 8131ec1..153a7d1 100644 --- a/components/bookmarks/browser/bookmark_model.cc +++ b/components/bookmarks/browser/bookmark_model.cc @@ -26,14 +26,8 @@ #include "ui/gfx/favicon_size.h" using base::Time; -using bookmarks::BookmarkClient; -using bookmarks::BookmarkExpandedStateTracker; -using bookmarks::BookmarkIndex; -using bookmarks::BookmarkLoadDetails; -using bookmarks::BookmarkMatch; -using bookmarks::BookmarkModelObserver; -using bookmarks::BookmarkNodeData; -using bookmarks::BookmarkStorage; + +namespace bookmarks { namespace { @@ -154,7 +148,7 @@ void BookmarkModel::Load( const BookmarkNode* BookmarkModel::GetParentForNewNodes() { std::vector<const BookmarkNode*> nodes = - bookmarks::GetMostRecentlyModifiedUserFolders(this, 1); + GetMostRecentlyModifiedUserFolders(this, 1); DCHECK(!nodes.empty()); // This list is always padded with default folders. return nodes[0]; } @@ -294,7 +288,7 @@ void BookmarkModel::Copy(const BookmarkNode* node, std::vector<BookmarkNodeData::Element> elements(drag_data.elements); // CloneBookmarkNode will use BookmarkModel methods to do the job, so we // don't need to send notifications here. - bookmarks::CloneBookmarkNode(this, elements, new_parent, index, true); + CloneBookmarkNode(this, elements, new_parent, index, true); if (store_.get()) store_->ScheduleSave(); @@ -513,7 +507,7 @@ const BookmarkNode* BookmarkModel::GetMostRecentlyAddedUserNodeForURL( const GURL& url) { std::vector<const BookmarkNode*> nodes; GetNodesByURL(url, &nodes); - std::sort(nodes.begin(), nodes.end(), &bookmarks::MoreRecentlyAdded); + std::sort(nodes.begin(), nodes.end(), &MoreRecentlyAdded); // Look for the first node that the user can edit. for (size_t i = 0; i < nodes.size(); ++i) { @@ -1027,3 +1021,5 @@ scoped_ptr<BookmarkLoadDetails> BookmarkModel::CreateLoadDetails( new BookmarkIndex(client_, accept_languages), next_node_id_)); } + +} // namespace bookmarks diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h index b72d396..076b01b 100644 --- a/components/bookmarks/browser/bookmark_model.h +++ b/components/bookmarks/browser/bookmark_model.h @@ -30,7 +30,16 @@ class FilePath; class SequencedTaskRunner; } +namespace favicon_base { +struct FaviconImageResult; +} + +namespace query_parser { +enum class MatchingAlgorithm; +} + namespace bookmarks { + class BookmarkCodecTest; class BookmarkExpandedStateTracker; class BookmarkIndex; @@ -40,15 +49,6 @@ class BookmarkStorage; class ScopedGroupBookmarkActions; class TestBookmarkClient; struct BookmarkMatch; -} - -namespace favicon_base { -struct FaviconImageResult; -} - -namespace query_parser { -enum class MatchingAlgorithm; -} // BookmarkModel -------------------------------------------------------------- @@ -67,7 +67,7 @@ class BookmarkModel : public KeyedService { base::string16 title; }; - explicit BookmarkModel(bookmarks::BookmarkClient* client); + explicit BookmarkModel(BookmarkClient* client); ~BookmarkModel() override; // KeyedService: @@ -112,8 +112,8 @@ class BookmarkModel : public KeyedService { // (as long as the model is loaded). const BookmarkNode* GetParentForNewNodes(); - void AddObserver(bookmarks::BookmarkModelObserver* observer); - void RemoveObserver(bookmarks::BookmarkModelObserver* observer); + void AddObserver(BookmarkModelObserver* observer); + void RemoveObserver(BookmarkModelObserver* observer); // Notifies the observers that an extensive set of changes is about to happen, // such as during import or sync, so they can delay any expensive UI updates @@ -242,15 +242,14 @@ class BookmarkModel : public KeyedService { // in either the title or the URL. It uses default matching algorithm. void GetBookmarksMatching(const base::string16& text, size_t max_count, - std::vector<bookmarks::BookmarkMatch>* matches); + std::vector<BookmarkMatch>* matches); // Returns up to |max_count| of bookmarks containing each term from |text| // in either the title or the URL. - void GetBookmarksMatching( - const base::string16& text, - size_t max_count, - query_parser::MatchingAlgorithm matching_algorithm, - std::vector<bookmarks::BookmarkMatch>* matches); + void GetBookmarksMatching(const base::string16& text, + size_t max_count, + query_parser::MatchingAlgorithm matching_algorithm, + std::vector<BookmarkMatch>* matches); // Sets the store to NULL, making it so the BookmarkModel does not persist // any changes to disk. This is only useful during testing to speed up @@ -262,7 +261,7 @@ class BookmarkModel : public KeyedService { // Returns the object responsible for tracking the set of expanded nodes in // the bookmark editor. - bookmarks::BookmarkExpandedStateTracker* expanded_state_tracker() { + BookmarkExpandedStateTracker* expanded_state_tracker() { return expanded_state_tracker_.get(); } @@ -302,13 +301,13 @@ class BookmarkModel : public KeyedService { void OnFaviconChanged(const std::set<GURL>& urls); // Returns the client used by this BookmarkModel. - bookmarks::BookmarkClient* client() const { return client_; } + BookmarkClient* client() const { return client_; } private: - friend class bookmarks::BookmarkCodecTest; - friend class bookmarks::BookmarkStorage; - friend class bookmarks::ScopedGroupBookmarkActions; - friend class bookmarks::TestBookmarkClient; + friend class BookmarkCodecTest; + friend class BookmarkStorage; + friend class ScopedGroupBookmarkActions; + friend class TestBookmarkClient; // Used to order BookmarkNodes by URL. class NodeURLComparator { @@ -330,7 +329,7 @@ class BookmarkModel : public KeyedService { // Invoked when loading is finished. Sets |loaded_| and notifies observers. // BookmarkModel takes ownership of |details|. - void DoneLoading(scoped_ptr<bookmarks::BookmarkLoadDetails> details); + void DoneLoading(scoped_ptr<BookmarkLoadDetails> details); // Populates |nodes_ordered_by_url_set_| from root. void PopulateNodesByURL(BookmarkNode* node); @@ -397,10 +396,10 @@ class BookmarkModel : public KeyedService { // Creates and returns a new BookmarkLoadDetails. It's up to the caller to // delete the returned object. - scoped_ptr<bookmarks::BookmarkLoadDetails> CreateLoadDetails( + scoped_ptr<BookmarkLoadDetails> CreateLoadDetails( const std::string& accept_languages); - bookmarks::BookmarkClient* const client_; + BookmarkClient* const client_; // Whether the initial set of data has been loaded. bool loaded_; @@ -417,7 +416,7 @@ class BookmarkModel : public KeyedService { int64 next_node_id_; // The observers. - ObserverList<bookmarks::BookmarkModelObserver> observers_; + ObserverList<BookmarkModelObserver> observers_; // Set of nodes ordered by URL. This is not a map to avoid copying the // urls. @@ -431,20 +430,22 @@ class BookmarkModel : public KeyedService { base::CancelableTaskTracker cancelable_task_tracker_; // Reads/writes bookmarks to disk. - scoped_ptr<bookmarks::BookmarkStorage> store_; + scoped_ptr<BookmarkStorage> store_; - scoped_ptr<bookmarks::BookmarkIndex> index_; + scoped_ptr<BookmarkIndex> index_; base::WaitableEvent loaded_signal_; // See description of IsDoingExtensiveChanges above. int extensive_changes_; - scoped_ptr<bookmarks::BookmarkExpandedStateTracker> expanded_state_tracker_; + scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_; std::set<std::string> non_cloned_keys_; DISALLOW_COPY_AND_ASSIGN(BookmarkModel); }; +} // namespace bookmarks + #endif // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_ diff --git a/components/bookmarks/browser/bookmark_model_observer.h b/components/bookmarks/browser/bookmark_model_observer.h index f3d5bb6..92d4db9 100644 --- a/components/bookmarks/browser/bookmark_model_observer.h +++ b/components/bookmarks/browser/bookmark_model_observer.h @@ -7,12 +7,13 @@ #include <set> -class BookmarkModel; class BookmarkNode; class GURL; namespace bookmarks { +class BookmarkModel; + // Observer for the BookmarkModel. class BookmarkModelObserver { public: diff --git a/components/bookmarks/browser/bookmark_node.h b/components/bookmarks/browser/bookmark_node.h index ef59ae6..fd3fd1a 100644 --- a/components/bookmarks/browser/bookmark_node.h +++ b/components/bookmarks/browser/bookmark_node.h @@ -13,7 +13,9 @@ #include "ui/gfx/image/image.h" #include "url/gurl.h" +namespace bookmarks { class BookmarkModel; +} // BookmarkNode --------------------------------------------------------------- @@ -115,7 +117,7 @@ class BookmarkNode : public ui::TreeNode<BookmarkNode> { // HistoryContentsProvider. private: - friend class BookmarkModel; + friend class bookmarks::BookmarkModel; // A helper function to initialize various fields during construction. void Initialize(int64 id); diff --git a/components/bookmarks/browser/bookmark_node_data.h b/components/bookmarks/browser/bookmark_node_data.h index 47e85f6..fd7d13d 100644 --- a/components/bookmarks/browser/bookmark_node_data.h +++ b/components/bookmarks/browser/bookmark_node_data.h @@ -12,18 +12,19 @@ #include "base/time/time.h" #include "components/bookmarks/browser/bookmark_node.h" #include "ui/base/clipboard/clipboard_types.h" - #include "url/gurl.h" + #if defined(TOOLKIT_VIEWS) #include "ui/base/dragdrop/os_exchange_data.h" #endif -class BookmarkModel; class Pickle; class PickleIterator; namespace bookmarks { +class BookmarkModel; + // BookmarkNodeData is used to represent the following: // // . A single URL. diff --git a/components/bookmarks/browser/bookmark_storage.h b/components/bookmarks/browser/bookmark_storage.h index 9fa8646..c7f51a5 100644 --- a/components/bookmarks/browser/bookmark_storage.h +++ b/components/bookmarks/browser/bookmark_storage.h @@ -14,8 +14,6 @@ #include "base/memory/weak_ptr.h" #include "components/bookmarks/browser/bookmark_node.h" -class BookmarkModel; - namespace base { class SequencedTaskRunner; } @@ -23,6 +21,7 @@ class SequencedTaskRunner; namespace bookmarks { class BookmarkIndex; +class BookmarkModel; // A list of BookmarkPermanentNodes that owns them. typedef ScopedVector<BookmarkPermanentNode> BookmarkPermanentNodeList; diff --git a/components/bookmarks/browser/bookmark_utils.h b/components/bookmarks/browser/bookmark_utils.h index 9fcbfb5..c10bc08 100644 --- a/components/bookmarks/browser/bookmark_utils.h +++ b/components/bookmarks/browser/bookmark_utils.h @@ -12,7 +12,6 @@ #include "base/strings/utf_offset_string_conversions.h" #include "components/bookmarks/browser/bookmark_node_data.h" -class BookmarkModel; class BookmarkNode; class GURL; @@ -26,6 +25,7 @@ class PrefRegistrySyncable; namespace bookmarks { class BookmarkClient; +class BookmarkModel; // Fields to use when finding matching bookmarks. struct QueryFields { diff --git a/components/bookmarks/browser/scoped_group_bookmark_actions.h b/components/bookmarks/browser/scoped_group_bookmark_actions.h index 965f39f..c2f0997 100644 --- a/components/bookmarks/browser/scoped_group_bookmark_actions.h +++ b/components/bookmarks/browser/scoped_group_bookmark_actions.h @@ -7,10 +7,10 @@ #include "base/macros.h" -class BookmarkModel; - namespace bookmarks { +class BookmarkModel; + // Scopes the grouping of a set of changes into one undoable action. class ScopedGroupBookmarkActions { public: diff --git a/components/bookmarks/test/bookmark_test_helpers.h b/components/bookmarks/test/bookmark_test_helpers.h index a75609e..aeffd42 100644 --- a/components/bookmarks/test/bookmark_test_helpers.h +++ b/components/bookmarks/test/bookmark_test_helpers.h @@ -7,10 +7,11 @@ #include <string> -class BookmarkModel; class BookmarkNode; namespace bookmarks { +class BookmarkModel; + namespace test { // Blocks until |model| finishes loading. diff --git a/components/bookmarks/test/test_bookmark_client.cc b/components/bookmarks/test/test_bookmark_client.cc index e02b2c8..b8b38e9 100644 --- a/components/bookmarks/test/test_bookmark_client.cc +++ b/components/bookmarks/test/test_bookmark_client.cc @@ -19,7 +19,7 @@ TestBookmarkClient::~TestBookmarkClient() {} scoped_ptr<BookmarkModel> TestBookmarkClient::CreateModel() { scoped_ptr<BookmarkModel> bookmark_model(new BookmarkModel(this)); - scoped_ptr<bookmarks::BookmarkLoadDetails> details = + scoped_ptr<BookmarkLoadDetails> details = bookmark_model->CreateLoadDetails(std::string()); details->LoadExtraNodes(); bookmark_model->DoneLoading(details.Pass()); @@ -27,7 +27,7 @@ scoped_ptr<BookmarkModel> TestBookmarkClient::CreateModel() { } void TestBookmarkClient::SetExtraNodesToLoad( - bookmarks::BookmarkPermanentNodeList extra_nodes) { + BookmarkPermanentNodeList extra_nodes) { extra_nodes_to_load_ = extra_nodes.Pass(); // Keep a copy in |extra_nodes_| for the acessor. extra_nodes_ = extra_nodes_to_load_.get(); @@ -63,7 +63,7 @@ bool TestBookmarkClient::IsPermanentNodeVisible( void TestBookmarkClient::RecordAction(const base::UserMetricsAction& action) { } -bookmarks::LoadExtraCallback TestBookmarkClient::GetLoadExtraNodesCallback() { +LoadExtraCallback TestBookmarkClient::GetLoadExtraNodesCallback() { return base::Bind(&TestBookmarkClient::LoadExtraNodes, base::Passed(&extra_nodes_to_load_)); } @@ -82,8 +82,8 @@ bool TestBookmarkClient::CanBeEditedByUser(const BookmarkNode* node) { } // static -bookmarks::BookmarkPermanentNodeList TestBookmarkClient::LoadExtraNodes( - bookmarks::BookmarkPermanentNodeList extra_nodes, +BookmarkPermanentNodeList TestBookmarkClient::LoadExtraNodes( + BookmarkPermanentNodeList extra_nodes, int64* next_id) { return extra_nodes.Pass(); } diff --git a/components/bookmarks/test/test_bookmark_client.h b/components/bookmarks/test/test_bookmark_client.h index 188832d..2c71e1b 100644 --- a/components/bookmarks/test/test_bookmark_client.h +++ b/components/bookmarks/test/test_bookmark_client.h @@ -8,10 +8,10 @@ #include "base/memory/scoped_ptr.h" #include "components/bookmarks/browser/bookmark_client.h" -class BookmarkModel; - namespace bookmarks { +class BookmarkModel; + class TestBookmarkClient : public BookmarkClient { public: TestBookmarkClient(); diff --git a/components/enhanced_bookmarks/bookmark_image_service.cc b/components/enhanced_bookmarks/bookmark_image_service.cc index 066d9f9..0831e38 100644 --- a/components/enhanced_bookmarks/bookmark_image_service.cc +++ b/components/enhanced_bookmarks/bookmark_image_service.cc @@ -1,6 +1,7 @@ // Copyright 2014 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 "components/enhanced_bookmarks/bookmark_image_service.h" #include "base/single_thread_task_runner.h" @@ -12,6 +13,8 @@ #include "components/enhanced_bookmarks/enhanced_bookmark_utils.h" #include "components/enhanced_bookmarks/persistent_image_store.h" +using bookmarks::BookmarkModel; + namespace { const char kSequenceToken[] = "BookmarkImagesSequenceToken"; diff --git a/components/enhanced_bookmarks/bookmark_image_service.h b/components/enhanced_bookmarks/bookmark_image_service.h index 02a61b4..2ee8d61 100644 --- a/components/enhanced_bookmarks/bookmark_image_service.h +++ b/components/enhanced_bookmarks/bookmark_image_service.h @@ -49,29 +49,30 @@ class BookmarkImageService : public KeyedService, void SalientImageForUrl(const GURL& page_url, Callback callback); // bookmarks::BookmarkModelObserver: - void BookmarkNodeRemoved(BookmarkModel* model, + void BookmarkNodeRemoved(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) override; - void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override; - void BookmarkNodeMoved(BookmarkModel* model, + void BookmarkModelLoaded(bookmarks::BookmarkModel* model, + bool ids_reassigned) override; + void BookmarkNodeMoved(bookmarks::BookmarkModel* model, const BookmarkNode* old_parent, int old_index, const BookmarkNode* new_parent, int new_index) override; - void BookmarkNodeAdded(BookmarkModel* model, + void BookmarkNodeAdded(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int index) override; - void OnWillChangeBookmarkNode(BookmarkModel* model, + void OnWillChangeBookmarkNode(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkNodeChanged(BookmarkModel* model, + void BookmarkNodeChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkNodeFaviconChanged(BookmarkModel* model, + void BookmarkNodeFaviconChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkNodeChildrenReordered(BookmarkModel* model, + void BookmarkNodeChildrenReordered(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkAllUserNodesRemoved(BookmarkModel* model, + void BookmarkAllUserNodesRemoved(bookmarks::BookmarkModel* model, const std::set<GURL>& removed_urls) override; protected: diff --git a/components/enhanced_bookmarks/enhanced_bookmark_model.cc b/components/enhanced_bookmarks/enhanced_bookmark_model.cc index 4b4b590..f9d3478 100644 --- a/components/enhanced_bookmarks/enhanced_bookmark_model.cc +++ b/components/enhanced_bookmarks/enhanced_bookmark_model.cc @@ -19,6 +19,8 @@ #include "ui/base/models/tree_node_iterator.h" #include "url/gurl.h" +using bookmarks::BookmarkModel; + namespace { const char* kBookmarkBarId = "f_bookmarks_bar"; diff --git a/components/enhanced_bookmarks/enhanced_bookmark_model.h b/components/enhanced_bookmarks/enhanced_bookmark_model.h index 9ba68e0..7eab266 100644 --- a/components/enhanced_bookmarks/enhanced_bookmark_model.h +++ b/components/enhanced_bookmarks/enhanced_bookmark_model.h @@ -17,13 +17,16 @@ #include "components/bookmarks/browser/bookmark_node.h" #include "components/keyed_service/core/keyed_service.h" +class BookmarkNode; +class GURL; + namespace base { class Time; -} // namespace base +} +namespace bookmarks { class BookmarkModel; -class BookmarkNode; -class GURL; +} FORWARD_DECLARE_TEST(EnhancedBookmarkModelTest, SetMultipleMetaInfo); @@ -36,7 +39,7 @@ class EnhancedBookmarkModelObserver; class EnhancedBookmarkModel : public KeyedService, public bookmarks::BaseBookmarkModelObserver { public: - EnhancedBookmarkModel(BookmarkModel* bookmark_model, + EnhancedBookmarkModel(bookmarks::BookmarkModel* bookmark_model, const std::string& version); ~EnhancedBookmarkModel() override; @@ -124,7 +127,7 @@ class EnhancedBookmarkModel : public KeyedService, // TODO(rfevang): Ideally nothing should need the underlying bookmark model. // Remove when that is actually the case. - BookmarkModel* bookmark_model() { return bookmark_model_; } + bookmarks::BookmarkModel* bookmark_model() { return bookmark_model_; } // Returns true if the enhanced bookmark model is done loading. bool loaded() { return loaded_; } @@ -140,22 +143,23 @@ class EnhancedBookmarkModel : public KeyedService, // bookmarks::BaseBookmarkModelObserver: void BookmarkModelChanged() override; - void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override; - void BookmarkNodeAdded(BookmarkModel* model, + void BookmarkModelLoaded(bookmarks::BookmarkModel* model, + bool ids_reassigned) override; + void BookmarkNodeAdded(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int index) override; - void BookmarkNodeRemoved(BookmarkModel* model, + void BookmarkNodeRemoved(bookmarks::BookmarkModel* model, const BookmarkNode* parent, int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) override; - void BookmarkNodeChanged(BookmarkModel* model, + void BookmarkNodeChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void OnWillChangeBookmarkMetaInfo(BookmarkModel* model, + void OnWillChangeBookmarkMetaInfo(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkMetaInfoChanged(BookmarkModel* model, + void BookmarkMetaInfoChanged(bookmarks::BookmarkModel* model, const BookmarkNode* node) override; - void BookmarkAllUserNodesRemoved(BookmarkModel* model, + void BookmarkAllUserNodesRemoved(bookmarks::BookmarkModel* model, const std::set<GURL>& removed_urls) override; // Initialize the mapping from remote ids to nodes. @@ -190,7 +194,7 @@ class EnhancedBookmarkModel : public KeyedService, void SetMultipleMetaInfo(const BookmarkNode* node, BookmarkNode::MetaInfoMap meta_info); - BookmarkModel* bookmark_model_; + bookmarks::BookmarkModel* bookmark_model_; bool loaded_; ObserverList<EnhancedBookmarkModelObserver> observers_; diff --git a/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc b/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc index df55b8f..db2c54f 100644 --- a/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc +++ b/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc @@ -20,6 +20,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" +using bookmarks::BookmarkModel; using enhanced_bookmarks::EnhancedBookmarkModel; namespace { diff --git a/components/enhanced_bookmarks/enhanced_bookmark_utils.cc b/components/enhanced_bookmarks/enhanced_bookmark_utils.cc index cf93760..13622ae 100644 --- a/components/enhanced_bookmarks/enhanced_bookmark_utils.cc +++ b/components/enhanced_bookmarks/enhanced_bookmark_utils.cc @@ -7,6 +7,8 @@ #include "base/i18n/string_compare.h" #include "components/bookmarks/browser/bookmark_model.h" +using bookmarks::BookmarkModel; + namespace enhanced_bookmarks { // Comparator used to sort bookmarks. No folders are allowed. diff --git a/components/enhanced_bookmarks/enhanced_bookmark_utils.h b/components/enhanced_bookmarks/enhanced_bookmark_utils.h index 23d7004..413ef03 100644 --- a/components/enhanced_bookmarks/enhanced_bookmark_utils.h +++ b/components/enhanced_bookmarks/enhanced_bookmark_utils.h @@ -9,9 +9,12 @@ #include <string> #include <vector> -class BookmarkModel; class BookmarkNode; +namespace bookmarks { +class BookmarkModel; +} + namespace enhanced_bookmarks { // The vector is sorted in place. @@ -21,22 +24,25 @@ void SortBookmarksByName(std::vector<const BookmarkNode*>& nodes); // Returns the permanent nodes whose url children are considered uncategorized // and whose folder children should be shown in the bookmark menu. // |model| must be loaded. -std::vector<const BookmarkNode*> PrimaryPermanentNodes(BookmarkModel* model); +std::vector<const BookmarkNode*> PrimaryPermanentNodes( + bookmarks::BookmarkModel* model); // Returns an unsorted vector of folders that are considered to be at the "root" // level of the bookmark hierarchy. Functionally, this means all direct // descendants of PrimaryPermanentNodes, and possibly a node for the bookmarks // bar. -std::vector<const BookmarkNode*> RootLevelFolders(BookmarkModel* model); +std::vector<const BookmarkNode*> RootLevelFolders( + bookmarks::BookmarkModel* model); // Returns whether |node| is a primary permanent node in the sense of // |PrimaryPermanentNodes|. -bool IsPrimaryPermanentNode(const BookmarkNode* node, BookmarkModel* model); +bool IsPrimaryPermanentNode(const BookmarkNode* node, + bookmarks::BookmarkModel* model); // Returns the root level folder in which this node is directly, or indirectly // via subfolders, located. const BookmarkNode* RootLevelFolderForNode(const BookmarkNode* node, - BookmarkModel* model); + bookmarks::BookmarkModel* model); } // namespace enhanced_bookmarks diff --git a/components/enhanced_bookmarks/metadata_accessor.cc b/components/enhanced_bookmarks/metadata_accessor.cc index fc74885..d259832 100644 --- a/components/enhanced_bookmarks/metadata_accessor.cc +++ b/components/enhanced_bookmarks/metadata_accessor.cc @@ -13,6 +13,7 @@ #include "ui/base/models/tree_node_iterator.h" using namespace image::collections; +using bookmarks::BookmarkModel; namespace { diff --git a/components/enhanced_bookmarks/metadata_accessor.h b/components/enhanced_bookmarks/metadata_accessor.h index 313705b..884a0e7 100644 --- a/components/enhanced_bookmarks/metadata_accessor.h +++ b/components/enhanced_bookmarks/metadata_accessor.h @@ -9,10 +9,13 @@ #include <string> #include <vector> -class BookmarkModel; class BookmarkNode; class GURL; +namespace bookmarks { +class BookmarkModel; +} + // TODO(rfevang): Remove this file once the remaining caller // is converted (enhanced_bookmarks_bridge.cc) @@ -32,11 +35,11 @@ extern const char* kNoteKey; // Returns the remoteId for a bookmark. If the bookmark doesn't have one already // this function will create and set one. -std::string RemoteIdFromBookmark(BookmarkModel* bookmark_model, +std::string RemoteIdFromBookmark(bookmarks::BookmarkModel* bookmark_model, const BookmarkNode* node); // Sets the description of a bookmark. -void SetDescriptionForBookmark(BookmarkModel* bookmark_model, +void SetDescriptionForBookmark(bookmarks::BookmarkModel* bookmark_model, const BookmarkNode* node, const std::string& description); @@ -46,7 +49,7 @@ std::string DescriptionFromBookmark(const BookmarkNode* node); // Sets the URL of an image representative of the page. // Expects the URL to be valid and not empty. // Returns true if the metainfo is successfully populated. -bool SetOriginalImageForBookmark(BookmarkModel* bookmark_model, +bool SetOriginalImageForBookmark(bookmarks::BookmarkModel* bookmark_model, const BookmarkNode* node, const GURL& url, int width, @@ -74,7 +77,7 @@ std::string SnippetFromBookmark(const BookmarkNode* node); // remove existing entries for empty urls or set them if the url is not empty. // expects valid or empty urls. Returns true if the metainfo is successfully // populated. -bool SetAllImagesForBookmark(BookmarkModel* bookmark_model, +bool SetAllImagesForBookmark(bookmarks::BookmarkModel* bookmark_model, const BookmarkNode* node, const GURL& image_url, int image_width, diff --git a/components/policy/core/browser/managed_bookmarks_tracker.cc b/components/policy/core/browser/managed_bookmarks_tracker.cc index 42ebc76..336ef02 100644 --- a/components/policy/core/browser/managed_bookmarks_tracker.cc +++ b/components/policy/core/browser/managed_bookmarks_tracker.cc @@ -19,6 +19,8 @@ #include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" +using bookmarks::BookmarkModel; + namespace policy { const char ManagedBookmarksTracker::kName[] = "name"; diff --git a/components/policy/core/browser/managed_bookmarks_tracker.h b/components/policy/core/browser/managed_bookmarks_tracker.h index c40d5e0..99f0761 100644 --- a/components/policy/core/browser/managed_bookmarks_tracker.h +++ b/components/policy/core/browser/managed_bookmarks_tracker.h @@ -11,7 +11,6 @@ #include "base/strings/string16.h" #include "components/policy/policy_export.h" -class BookmarkModel; class BookmarkNode; class BookmarkPermanentNode; class GURL; @@ -21,6 +20,10 @@ namespace base { class ListValue; } +namespace bookmarks { +class BookmarkModel; +} + namespace policy { // Tracks the Managed Bookmarks policy value and makes the managed_node() in @@ -34,7 +37,7 @@ class POLICY_EXPORT ManagedBookmarksTracker { static const char kUrl[]; static const char kChildren[]; - ManagedBookmarksTracker(BookmarkModel* model, + ManagedBookmarksTracker(bookmarks::BookmarkModel* model, PrefService* prefs, const GetManagementDomainCallback& callback); ~ManagedBookmarksTracker(); @@ -63,7 +66,7 @@ class POLICY_EXPORT ManagedBookmarksTracker { GURL* url, const base::ListValue** children); - BookmarkModel* model_; + bookmarks::BookmarkModel* model_; BookmarkPermanentNode* managed_node_; PrefService* prefs_; PrefChangeRegistrar registrar_; diff --git a/components/policy/core/browser/managed_bookmarks_tracker_unittest.cc b/components/policy/core/browser/managed_bookmarks_tracker_unittest.cc index 9b609fb..238fac4 100644 --- a/components/policy/core/browser/managed_bookmarks_tracker_unittest.cc +++ b/components/policy/core/browser/managed_bookmarks_tracker_unittest.cc @@ -24,6 +24,7 @@ #include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" +using bookmarks::BookmarkModel; using testing::Mock; using testing::_; |