Rename BookmarkModelObserver::Loaded() method to BookmarkModelLoaded().

Every other method in BookmarkModelObserver starts with either
BookmarkModel if it is related to BookmarkModel or or BookmarkNode if it
is related to BookmarkNodes.

To be consistent Loaded() should start with BookmarkModel since it is
saying the model has been loaded.

BUG=330428
TEST=None, no functional changes.
R=brettw@chromium.org
TBR=ben

Review URL: https://codereview.chromium.org/120853002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242515 0039d316-1c4b-4281-b951-d872f2087c98

54 files changed, 130 insertions, 102 deletions

diff --git a/chrome/browser/android/bookmarks/bookmarks_bridge.cc b/chrome/browser/android/bookmarks/bookmarks_bridge.cc
index 2067e53..d1bfa9d 100644
--- a/chrome/browser/android/bookmarks/bookmarks_bridge.cc
+++ b/chrome/browser/android/bookmarks/bookmarks_bridge.cc
@@ -330,7 +330,8 @@ void BookmarksBridge::BookmarkModelChanged() {
   Java_BookmarksBridge_bookmarkModelChanged(env, obj.obj());
 }
 
-void BookmarksBridge::Loaded(BookmarkModel* model, bool ids_reassigned) {
+void BookmarksBridge::BookmarkModelLoaded(BookmarkModel* model,
+                                          bool ids_reassigned) {
   NotifyIfDoneLoading();
 }
 
diff --git a/chrome/browser/android/bookmarks/bookmarks_bridge.h b/chrome/browser/android/bookmarks/bookmarks_bridge.h
index dd5e86b..76100ae 100644
--- a/chrome/browser/android/bookmarks/bookmarks_bridge.h
+++ b/chrome/browser/android/bookmarks/bookmarks_bridge.h
@@ -70,7 +70,8 @@ class BookmarksBridge : public BaseBookmarkModelObserver,
   // any of the other callback methods. For example, this is called when
   // managed or partner bookmarks change.
   virtual void BookmarkModelChanged() OVERRIDE;
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
diff --git a/chrome/browser/android/provider/bookmark_model_observer_task.cc b/chrome/browser/android/provider/bookmark_model_observer_task.cc
index 634e04a..68dcb1e 100644
--- a/chrome/browser/android/provider/bookmark_model_observer_task.cc
+++ b/chrome/browser/android/provider/bookmark_model_observer_task.cc
@@ -31,9 +31,8 @@ BookmarkModelObserverTask::~BookmarkModelObserverTask() {
   model()->RemoveObserver(this);
 }
 
-void BookmarkModelObserverTask::Loaded(BookmarkModel* model,
-                                       bool ids_reassigned) {
-}
+void BookmarkModelObserverTask::BookmarkModelLoaded(BookmarkModel* model,
+                                                    bool ids_reassigned) {}
 
 void BookmarkModelObserverTask::BookmarkNodeMoved(
     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 4f72e5a..ce83f9e 100644
--- a/chrome/browser/android/provider/bookmark_model_observer_task.h
+++ b/chrome/browser/android/provider/bookmark_model_observer_task.h
@@ -31,7 +31,8 @@ class BookmarkModelObserverTask : public BookmarkModelTask,
   virtual ~BookmarkModelObserverTask();
 
   // BookmarkModelObserver:
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
                                  int old_index,
diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc
index c197236..63efcdd 100644
--- a/chrome/browser/automation/automation_provider_observers.cc
+++ b/chrome/browser/automation/automation_provider_observers.cc
@@ -1242,8 +1242,9 @@ AutomationProviderBookmarkModelObserver::
   model_->RemoveObserver(this);
 }
 
-void AutomationProviderBookmarkModelObserver::Loaded(BookmarkModel* model,
-                                                     bool ids_reassigned) {
+void AutomationProviderBookmarkModelObserver::BookmarkModelLoaded(
+    BookmarkModel* model,
+    bool ids_reassigned) {
   ReplyAndDelete(true);
 }
 
diff --git a/chrome/browser/automation/automation_provider_observers.h b/chrome/browser/automation/automation_provider_observers.h
index 38f12c4..3e512ba 100644
--- a/chrome/browser/automation/automation_provider_observers.h
+++ b/chrome/browser/automation/automation_provider_observers.h
@@ -755,7 +755,8 @@ class AutomationProviderBookmarkModelObserver : public BookmarkModelObserver {
   virtual ~AutomationProviderBookmarkModelObserver();
 
   // BookmarkModelObserver:
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
diff --git a/chrome/browser/bookmarks/base_bookmark_model_observer.cc b/chrome/browser/bookmarks/base_bookmark_model_observer.cc
index ce1d1d8..f623b5e 100644
--- a/chrome/browser/bookmarks/base_bookmark_model_observer.cc
+++ b/chrome/browser/bookmarks/base_bookmark_model_observer.cc
@@ -4,9 +4,8 @@
 
 #include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
 
-void BaseBookmarkModelObserver::Loaded(BookmarkModel* model,
-                                       bool ids_reassigned) {
-}
+void BaseBookmarkModelObserver::BookmarkModelLoaded(BookmarkModel* model,
+                                                    bool ids_reassigned) {}
 
 void BaseBookmarkModelObserver::BookmarkModelBeingDeleted(
     BookmarkModel* model) {
diff --git a/chrome/browser/bookmarks/base_bookmark_model_observer.h b/chrome/browser/bookmarks/base_bookmark_model_observer.h
index 7cdc1a1..29c1e462 100644
--- a/chrome/browser/bookmarks/base_bookmark_model_observer.h
+++ b/chrome/browser/bookmarks/base_bookmark_model_observer.h
@@ -18,7 +18,8 @@ class BaseBookmarkModelObserver : public BookmarkModelObserver {
   virtual void BookmarkModelChanged() = 0;
 
   // BookmarkModelObserver:
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
diff --git a/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc b/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc
index 09c1386..f64fd69 100644
--- a/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc
+++ b/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc
@@ -59,8 +59,8 @@ BookmarkExpandedStateTracker::GetExpandedNodes() {
   return nodes;
 }
 
-void BookmarkExpandedStateTracker::Loaded(BookmarkModel* model,
-                                          bool ids_reassigned) {
+void BookmarkExpandedStateTracker::BookmarkModelLoaded(BookmarkModel* model,
+                                                       bool ids_reassigned) {
   if (ids_reassigned) {
     // If the ids change we can't trust the value in preferences and need to
     // reset it.
diff --git a/chrome/browser/bookmarks/bookmark_expanded_state_tracker.h b/chrome/browser/bookmarks/bookmark_expanded_state_tracker.h
index 96ba77f..99ee843 100644
--- a/chrome/browser/bookmarks/bookmark_expanded_state_tracker.h
+++ b/chrome/browser/bookmarks/bookmark_expanded_state_tracker.h
@@ -30,7 +30,8 @@ class BookmarkExpandedStateTracker : public BaseBookmarkModelObserver {
 
  private:
   // BaseBookmarkModelObserver:
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelChanged() OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
   virtual void BookmarkNodeRemoved(BookmarkModel* model,
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index 410caea..84b78a8 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -833,7 +833,7 @@ void BookmarkModel::DoneLoading(BookmarkLoadDetails* details_delete_me) {
 
   // Notify our direct observers.
   FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
-                    Loaded(this, details->ids_reassigned()));
+                    BookmarkModelLoaded(this, details->ids_reassigned()));
 }
 
 void BookmarkModel::RemoveAndDeleteNode(BookmarkNode* delete_me) {
diff --git a/chrome/browser/bookmarks/bookmark_model_observer.h b/chrome/browser/bookmarks/bookmark_model_observer.h
index aea1a0a..d9116e8 100644
--- a/chrome/browser/bookmarks/bookmark_model_observer.h
+++ b/chrome/browser/bookmarks/bookmark_model_observer.h
@@ -13,7 +13,8 @@ class BookmarkModelObserver {
  public:
   // Invoked when the model has finished loading. |ids_reassigned| mirrors
   // that of BookmarkLoadDetails::ids_reassigned. See it for details.
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) = 0;
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) = 0;
 
   // Invoked from the destructor of the BookmarkModel.
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) {}
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index 8bf18f8..59e34e3 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -146,7 +146,8 @@ class BookmarkModelTest : public testing::Test,
     ClearCounts();
   }
 
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE {
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE {
     // We never load from the db, so that this should never get invoked.
     NOTREACHED();
   }
diff --git a/chrome/browser/bookmarks/bookmark_tag_model.cc b/chrome/browser/bookmarks/bookmark_tag_model.cc
index abc5ff5..ed4b7da 100644
--- a/chrome/browser/bookmarks/bookmark_tag_model.cc
+++ b/chrome/browser/bookmarks/bookmark_tag_model.cc
@@ -307,7 +307,8 @@ std::vector<BookmarkTag> BookmarkTagModel::TagsRelatedToTag(
 
 // BookmarkModelObserver methods.
 
-void BookmarkTagModel::Loaded(BookmarkModel* model, bool ids_reassigned) {
+void BookmarkTagModel::BookmarkModelLoaded(BookmarkModel* model,
+                                           bool ids_reassigned) {
   Load();
 }
 
@@ -505,7 +506,7 @@ void BookmarkTagModel::Load() {
   }
   loaded_ = true;
   FOR_EACH_OBSERVER(BookmarkTagModelObserver, observers_,
-                    Loaded(this));
+                    BookmarkTagModelLoaded(this));
 }
 
 void BookmarkTagModel::ReloadDescendants(const BookmarkNode* folder) {
diff --git a/chrome/browser/bookmarks/bookmark_tag_model.h b/chrome/browser/bookmarks/bookmark_tag_model.h
index 01fcbf2..c22b28a 100644
--- a/chrome/browser/bookmarks/bookmark_tag_model.h
+++ b/chrome/browser/bookmarks/bookmark_tag_model.h
@@ -127,7 +127,8 @@ class BookmarkTagModel : public BookmarkModelObserver {
   std::vector<BookmarkTag> TagsRelatedToTag(const BookmarkTag& tag);
 
   // All the BookmarkModelObserver methods. See there for details.
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
diff --git a/chrome/browser/bookmarks/bookmark_tag_model_observer.h b/chrome/browser/bookmarks/bookmark_tag_model_observer.h
index 4c1df21..580ba1a 100644
--- a/chrome/browser/bookmarks/bookmark_tag_model_observer.h
+++ b/chrome/browser/bookmarks/bookmark_tag_model_observer.h
@@ -12,7 +12,7 @@ class BookmarkNode;
 class BookmarkTagModelObserver {
  public:
   // Invoked when the model has finished loading.
-  virtual void Loaded(BookmarkTagModel* model) = 0;
+  virtual void BookmarkTagModelLoaded(BookmarkTagModel* model) = 0;
 
   // Invoked from the destructor of the BookmarkTagModel.
   virtual void BookmarkTagModelBeingDeleted(BookmarkTagModel* model) {}
diff --git a/chrome/browser/bookmarks/bookmark_tag_model_unittest.cc b/chrome/browser/bookmarks/bookmark_tag_model_unittest.cc
index 18fa57b..9a7e639 100644
--- a/chrome/browser/bookmarks/bookmark_tag_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_tag_model_unittest.cc
@@ -102,9 +102,8 @@ class BookmarkTagModelTest
   virtual ~BookmarkTagModelTest() {
   }
 
-  // BookmarkTagModelObserver methods.
-
-  virtual void Loaded(BookmarkTagModel* model) OVERRIDE {
+  // BookmarkTagModelObserver:
+  virtual void BookmarkTagModelLoaded(BookmarkTagModel* model) OVERRIDE {
     // We never load from the db, so that this should never get invoked.
     NOTREACHED();
   }
diff --git a/chrome/browser/bookmarks/bookmark_test_helpers.cc b/chrome/browser/bookmarks/bookmark_test_helpers.cc
index 73898d8..51870ae 100644
--- a/chrome/browser/bookmarks/bookmark_test_helpers.cc
+++ b/chrome/browser/bookmarks/bookmark_test_helpers.cc
@@ -29,7 +29,8 @@ class BookmarkLoadObserver : public BaseBookmarkModelObserver {
  private:
   // BaseBookmarkModelObserver:
   virtual void BookmarkModelChanged() OVERRIDE;
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
 
   base::Closure quit_task_;
 
@@ -43,7 +44,8 @@ BookmarkLoadObserver::~BookmarkLoadObserver() {}
 
 void BookmarkLoadObserver::BookmarkModelChanged() {}
 
-void BookmarkLoadObserver::Loaded(BookmarkModel* model, bool ids_reassigned) {
+void BookmarkLoadObserver::BookmarkModelLoaded(BookmarkModel* model,
+                                               bool ids_reassigned) {
   quit_task_.Run();
 }
 
diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
index 32068e1..84fc067 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
+++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
@@ -149,14 +149,14 @@ bool BookmarksFunction::EditBookmarksEnabled() {
 void BookmarksFunction::BookmarkModelChanged() {
 }
 
-void BookmarksFunction::Loaded(BookmarkModel* model, bool ids_reassigned) {
+void BookmarksFunction::BookmarkModelLoaded(BookmarkModel* model,
+                                            bool ids_reassigned) {
   model->RemoveObserver(this);
   Run();
   Release();  // Balanced in Run().
 }
 
-BookmarkEventRouter::BookmarkEventRouter(Profile* profile,
-                                         BookmarkModel* model)
+BookmarkEventRouter::BookmarkEventRouter(Profile* profile, BookmarkModel* model)
     : profile_(profile),
       model_(model) {
   model_->AddObserver(this);
@@ -177,7 +177,8 @@ void BookmarkEventRouter::DispatchEvent(
   }
 }
 
-void BookmarkEventRouter::Loaded(BookmarkModel* model, bool ids_reassigned) {
+void BookmarkEventRouter::BookmarkModelLoaded(BookmarkModel* model,
+                                              bool ids_reassigned) {
   // TODO(erikkay): Perhaps we should send this event down to the extension
   // so they know when it's safe to use the API?
 }
diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h
index 62d91a3..7853363 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h
+++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h
@@ -34,7 +34,8 @@ class BookmarkEventRouter : public BookmarkModelObserver {
   virtual ~BookmarkEventRouter();
 
   // BookmarkModelObserver:
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
@@ -126,7 +127,8 @@ class BookmarksFunction : public ChromeAsyncExtensionFunction,
  private:
   // BaseBookmarkModelObserver:
   virtual void BookmarkModelChanged() OVERRIDE;
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
 };
 
 class BookmarksGetFunction : public BookmarksFunction {
diff --git a/chrome/browser/importer/external_process_importer_host.cc b/chrome/browser/importer/external_process_importer_host.cc
index d69388b..da1de12 100644
--- a/chrome/browser/importer/external_process_importer_host.cc
+++ b/chrome/browser/importer/external_process_importer_host.cc
@@ -115,8 +115,8 @@ void ExternalProcessImporterHost::LaunchImportIfReady() {
   client_->Start();
 }
 
-void ExternalProcessImporterHost::Loaded(BookmarkModel* model,
-                                         bool ids_reassigned) {
+void ExternalProcessImporterHost::BookmarkModelLoaded(BookmarkModel* model,
+                                                      bool ids_reassigned) {
   DCHECK(model->loaded());
   model->RemoveObserver(this);
   waiting_for_bookmarkbar_model_ = false;
diff --git a/chrome/browser/importer/external_process_importer_host.h b/chrome/browser/importer/external_process_importer_host.h
index 1f61e74..ed2a8f1 100644
--- a/chrome/browser/importer/external_process_importer_host.h
+++ b/chrome/browser/importer/external_process_importer_host.h
@@ -80,7 +80,8 @@ class ExternalProcessImporterHost : public BaseBookmarkModelObserver {
   virtual void LaunchImportIfReady();
 
   // BaseBookmarkModelObserver:
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
   virtual void BookmarkModelChanged() OVERRIDE;
 
diff --git a/chrome/browser/profiles/bookmark_model_loaded_observer.cc b/chrome/browser/profiles/bookmark_model_loaded_observer.cc
index 56c1135..78cd918 100644
--- a/chrome/browser/profiles/bookmark_model_loaded_observer.cc
+++ b/chrome/browser/profiles/bookmark_model_loaded_observer.cc
@@ -14,8 +14,8 @@ BookmarkModelLoadedObserver::BookmarkModelLoadedObserver(Profile* profile)
 void BookmarkModelLoadedObserver::BookmarkModelChanged() {
 }
 
-void BookmarkModelLoadedObserver::Loaded(BookmarkModel* model,
-                                         bool ids_reassigned) {
+void BookmarkModelLoadedObserver::BookmarkModelLoaded(BookmarkModel* model,
+                                                      bool ids_reassigned) {
   // Causes lazy-load if sync is enabled.
   ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile_);
   model->RemoveObserver(this);
diff --git a/chrome/browser/profiles/bookmark_model_loaded_observer.h b/chrome/browser/profiles/bookmark_model_loaded_observer.h
index d40cea8..9b8ef29 100644
--- a/chrome/browser/profiles/bookmark_model_loaded_observer.h
+++ b/chrome/browser/profiles/bookmark_model_loaded_observer.h
@@ -17,7 +17,8 @@ class BookmarkModelLoadedObserver : public BaseBookmarkModelObserver {
 
  private:
   virtual void BookmarkModelChanged() OVERRIDE;
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
 
   Profile* profile_;
diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc
index fb26475..c0dd5b6 100644
--- a/chrome/browser/sync/glue/bookmark_change_processor.cc
+++ b/chrome/browser/sync/glue/bookmark_change_processor.cc
@@ -204,8 +204,8 @@ void BookmarkChangeProcessor::RemoveAllChildNodes(
   }
 }
 
-void BookmarkChangeProcessor::Loaded(BookmarkModel* model,
-                                     bool ids_reassigned) {
+void BookmarkChangeProcessor::BookmarkModelLoaded(BookmarkModel* model,
+                                                  bool ids_reassigned) {
   NOTREACHED();
 }
 
diff --git a/chrome/browser/sync/glue/bookmark_change_processor.h b/chrome/browser/sync/glue/bookmark_change_processor.h
index e944136..7945b5b 100644
--- a/chrome/browser/sync/glue/bookmark_change_processor.h
+++ b/chrome/browser/sync/glue/bookmark_change_processor.h
@@ -38,7 +38,8 @@ class BookmarkChangeProcessor : public BookmarkModelObserver,
 
   // BookmarkModelObserver implementation.
   // BookmarkModel -> sync API model change application.
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller.cc b/chrome/browser/sync/glue/bookmark_data_type_controller.cc
index c91de7c..1ed2066 100644
--- a/chrome/browser/sync/glue/bookmark_data_type_controller.cc
+++ b/chrome/browser/sync/glue/bookmark_data_type_controller.cc
@@ -90,8 +90,8 @@ void BookmarkDataTypeController::CreateSyncComponents() {
 void BookmarkDataTypeController::BookmarkModelChanged() {
 }
 
-void BookmarkDataTypeController::Loaded(BookmarkModel* model,
-                                        bool ids_reassigned) {
+void BookmarkDataTypeController::BookmarkModelLoaded(BookmarkModel* model,
+                                                     bool ids_reassigned) {
   DCHECK(model->loaded());
   model->RemoveObserver(this);
   installed_bookmark_observer_ = false;
diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller.h b/chrome/browser/sync/glue/bookmark_data_type_controller.h
index e760414..824ecd2 100644
--- a/chrome/browser/sync/glue/bookmark_data_type_controller.h
+++ b/chrome/browser/sync/glue/bookmark_data_type_controller.h
@@ -42,7 +42,8 @@ class BookmarkDataTypeController : public FrontendDataTypeController,
 
   // BaseBookmarkModelObserver interface.
   virtual void BookmarkModelChanged() OVERRIDE;
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
 
   // Helper that returns true iff both the bookmark model and the history
diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc
index 7ecb916..3f5363b 100644
--- a/chrome/browser/sync/test/integration/bookmarks_helper.cc
+++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc
@@ -81,7 +81,8 @@ class FaviconChangeObserver : public BookmarkModelObserver {
     wait_for_load_ = false;
     content::RunMessageLoop();
   }
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE {}
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE {}
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
                                  int old_index,
diff --git a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
index 33e8b34..7d70696 100644
--- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
@@ -101,7 +101,8 @@ void BookmarkTabHelper::UpdateStarredStateForCurrentURL() {
 void BookmarkTabHelper::BookmarkModelChanged() {
 }
 
-void BookmarkTabHelper::Loaded(BookmarkModel* model, bool ids_reassigned) {
+void BookmarkTabHelper::BookmarkModelLoaded(BookmarkModel* model,
+                                            bool ids_reassigned) {
   UpdateStarredStateForCurrentURL();
 }
 
diff --git a/chrome/browser/ui/bookmarks/bookmark_tab_helper.h b/chrome/browser/ui/bookmarks/bookmark_tab_helper.h
index 6a16a0a..f237334 100644
--- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.h
+++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.h
@@ -64,7 +64,8 @@ class BookmarkTabHelper
 
   // Overridden from BaseBookmarkModelObserver:
   virtual void BookmarkModelChanged() OVERRIDE;
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
   virtual void BookmarkNodeAdded(BookmarkModel* model,
                                  const BookmarkNode* parent,
                                  int index) OVERRIDE;
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 b42ec94..19e3626 100644
--- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc
+++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc
@@ -134,10 +134,8 @@ void RecentlyUsedFoldersComboModel::RemoveObserver(
   observers_.RemoveObserver(observer);
 }
 
-
-void RecentlyUsedFoldersComboModel::Loaded(BookmarkModel* model,
-                                           bool ids_reassigned) {
-}
+void RecentlyUsedFoldersComboModel::BookmarkModelLoaded(BookmarkModel* model,
+                                                        bool ids_reassigned) {}
 
 void RecentlyUsedFoldersComboModel::BookmarkModelBeingDeleted(
     BookmarkModel* model) {
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 dab2808..9f32dec 100644
--- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h
+++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h
@@ -20,9 +20,8 @@ class BookmarkNode;
 // list always contains the Bookmarks Bar, Other Bookmarks and the parent
 // folder. The list also contains an extra item that shows the text
 // "Choose Another Folder...".
-class RecentlyUsedFoldersComboModel
-    : public ui::ComboboxModel,
-      public BookmarkModelObserver {
+class RecentlyUsedFoldersComboModel : public ui::ComboboxModel,
+                                      public BookmarkModelObserver {
  public:
   RecentlyUsedFoldersComboModel(BookmarkModel* model, const BookmarkNode* node);
   virtual ~RecentlyUsedFoldersComboModel();
@@ -35,8 +34,9 @@ class RecentlyUsedFoldersComboModel
   virtual void AddObserver(ui::ComboboxModelObserver* observer) OVERRIDE;
   virtual void RemoveObserver(ui::ComboboxModelObserver* observer) OVERRIDE;
 
-  // Overriden from BaseBookmarkModelObserver:
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  // Overriden from BookmarkModelObserver:
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h
index 34bab70..623a7e4 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h
@@ -26,8 +26,9 @@ class BookmarkBarBridge : public BookmarkModelObserver {
                     BookmarkModel* model);
   virtual ~BookmarkBarBridge();
 
-  // Overridden from BookmarkModelObserver
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  // Overridden from BookmarkModelObserver:
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm
index 3283efd..a1b6c28 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm
@@ -23,7 +23,7 @@ BookmarkBarBridge::BookmarkBarBridge(Profile* profile,
   // Bookmark loading is async; it may may not have happened yet.
   // We will be notified when that happens with the AddObserver() call.
   if (model->loaded())
-    Loaded(model, false);
+    BookmarkModelLoaded(model, false);
 
   profile_pref_registrar_.Init(profile->GetPrefs());
   profile_pref_registrar_.Add(
@@ -38,7 +38,8 @@ BookmarkBarBridge::~BookmarkBarBridge() {
   model_->RemoveObserver(this);
 }
 
-void BookmarkBarBridge::Loaded(BookmarkModel* model, bool ids_reassigned) {
+void BookmarkBarBridge::BookmarkModelLoaded(BookmarkModel* model,
+                                            bool ids_reassigned) {
   [controller_ loaded:model];
 }
 
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 cf10573..d284505 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm
@@ -115,7 +115,7 @@ TEST_F(BookmarkBarBridgeTest, TestRedirect) {
                                                              model));
   EXPECT_TRUE(bridge.get());
 
-  bridge->Loaded(NULL, false);
+  bridge->BookmarkModelLoaded(NULL, false);
   bridge->BookmarkModelBeingDeleted(NULL);
   bridge->BookmarkNodeMoved(NULL, NULL, 0, NULL, 0);
   bridge->BookmarkNodeAdded(NULL, NULL, 0);
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 538ba47..21ee25d 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
@@ -119,7 +119,8 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
         importing_(false)
   { }
 
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE {
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE {
     [controller_ modelChangedPreserveSelection:YES];
   }
 
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h
index 1d8fc04..3ddaf39 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h
@@ -40,7 +40,8 @@ class BookmarkMenuBridge : public BookmarkModelObserver,
   virtual ~BookmarkMenuBridge();
 
   // BookmarkModelObserver:
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
index 566f88a..eb9cb2f 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
@@ -42,7 +42,8 @@ NSMenu* BookmarkMenuBridge::BookmarkMenu() {
   return [controller_ menu];
 }
 
-void BookmarkMenuBridge::Loaded(BookmarkModel* model, bool ids_reassigned) {
+void BookmarkMenuBridge::BookmarkModelLoaded(BookmarkModel* model,
+                                             bool ids_reassigned) {
   InvalidateMenu();
 }
 
@@ -170,7 +171,7 @@ void BookmarkMenuBridge::ObserveBookmarkModel() {
   BookmarkModel* model = GetBookmarkModel();
   model->AddObserver(this);
   if (model->loaded())
-    Loaded(model, false);
+    BookmarkModelLoaded(model, false);
 }
 
 BookmarkModel* BookmarkMenuBridge::GetBookmarkModel() {
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 80f0501..0474e3d 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
@@ -96,7 +96,7 @@ class BookmarkMenuBridgeTest : public CocoaProfileTest {
 
 TEST_F(BookmarkMenuBridgeTest, TestBookmarkMenuAutoSeparator) {
   BookmarkModel* model = bridge_->GetBookmarkModel();
-  bridge_->Loaded(model, false);
+  bridge_->BookmarkModelLoaded(model, false);
   NSMenu* menu = bridge_->menu_;
   bridge_->UpdateMenu(menu);
   // The bare menu after loading used to have a separator and an
@@ -143,7 +143,7 @@ TEST_F(BookmarkMenuBridgeTest, TestClearBookmarkMenu) {
 // Test invalidation
 TEST_F(BookmarkMenuBridgeTest, TestInvalidation) {
   BookmarkModel* model = bridge_->GetBookmarkModel();
-  bridge_->Loaded(model, false);
+  bridge_->BookmarkModelLoaded(model, false);
 
   EXPECT_FALSE(menu_is_valid());
   bridge_->UpdateMenu(bridge_->menu_);
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 f5246b6..a11258b 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
@@ -63,20 +63,21 @@ class BookmarkModelObserverForCocoa : public BookmarkModelObserver {
   // Some notifications we don't care about, but by being pure virtual
   // in the base class we must implement them.
 
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE { }
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE {}
   virtual void BookmarkNodeAdded(BookmarkModel* model,
                                  const BookmarkNode* parent,
-                                 int index) OVERRIDE { }
+                                 int index) OVERRIDE {}
   virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
-                                          const BookmarkNode* node) OVERRIDE { }
+                                          const BookmarkNode* node) OVERRIDE {}
   virtual void BookmarkNodeChildrenReordered(
       BookmarkModel* model,
-      const BookmarkNode* node) OVERRIDE { }
+      const BookmarkNode* node) OVERRIDE {}
 
   virtual void ExtensiveBookmarkChangesBeginning(
-      BookmarkModel* model) OVERRIDE { }
+      BookmarkModel* model) OVERRIDE {}
 
-  virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) OVERRIDE { }
+  virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) OVERRIDE {}
 
  private:
   BookmarkModel* model_;  // Weak; it is owned by a Profile.
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
index 6742c79..f6b60da 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
@@ -305,7 +305,7 @@ void BookmarkBarGtk::Init() {
   model_ = BookmarkModelFactory::GetForProfile(profile);
   model_->AddObserver(this);
   if (model_->loaded())
-    Loaded(model_, false);
+    BookmarkModelLoaded(model_, false);
   // else case: we'll receive notification back from the BookmarkModel when done
   // loading, then we'll populate the bar.
 }
@@ -879,7 +879,8 @@ void BookmarkBarGtk::ClearToolbarDropHighlighting() {
                                       NULL, 0);
 }
 
-void BookmarkBarGtk::Loaded(BookmarkModel* model, bool ids_reassigned) {
+void BookmarkBarGtk::BookmarkModelLoaded(BookmarkModel* model,
+                                         bool ids_reassigned) {
   // If |instructions_| has been nulled, we are in the middle of browser
   // shutdown. Do nothing.
   if (!instructions_)
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h
index 5a22c3b..2df0428 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h
@@ -208,15 +208,9 @@ class BookmarkBarGtk : public gfx::AnimationDelegate,
   void ClearToolbarDropHighlighting();
 
   // Overridden from BookmarkModelObserver:
-
-  // Invoked when the bookmark model has finished loading. Creates a button
-  // for each of the children of the root node from the model.
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
-
-  // Invoked when the model is being deleted.
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
-
-  // Invoked when a node has moved.
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
                                  int old_index,
@@ -232,7 +226,6 @@ class BookmarkBarGtk : public gfx::AnimationDelegate,
   virtual void BookmarkAllNodesRemoved(BookmarkModel* model) OVERRIDE;
   virtual void BookmarkNodeChanged(BookmarkModel* model,
                                    const BookmarkNode* node) OVERRIDE;
-  // Invoked when a favicon has finished loading.
   virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
                                           const BookmarkNode* node) OVERRIDE;
   virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
index 0d72c84..5d552c1 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
@@ -63,7 +63,7 @@ class BookmarkBarGtkUnittest : public testing::Test {
 };
 
 TEST_F(BookmarkBarGtkUnittest, DisplaysHelpMessageOnEmpty) {
-  bookmark_bar_->Loaded(model_, false);
+  bookmark_bar_->BookmarkModelLoaded(model_, false);
 
   // There are no bookmarks in the model by default. Expect that the
   // |instructions_label| is shown.
@@ -75,7 +75,7 @@ TEST_F(BookmarkBarGtkUnittest, HidesHelpMessageWithBookmark) {
   model_->AddURL(parent, parent->child_count(),
                  base::ASCIIToUTF16("title"), GURL("http://one.com"));
 
-  bookmark_bar_->Loaded(model_, false);
+  bookmark_bar_->BookmarkModelLoaded(model_, false);
   EXPECT_FALSE(bookmark_bar_->show_instructions_);
 }
 
@@ -86,7 +86,7 @@ TEST_F(BookmarkBarGtkUnittest, BuildsButtons) {
   model_->AddURL(parent, parent->child_count(),
                  base::ASCIIToUTF16("other"), GURL("http://two.com"));
 
-  bookmark_bar_->Loaded(model_, false);
+  bookmark_bar_->BookmarkModelLoaded(model_, false);
 
   // We should expect two children to the bookmark bar's toolbar.
   GList* children = gtk_container_get_children(
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.h b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.h
index e4e4533..ac7c5ae 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.h
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.h
@@ -58,7 +58,8 @@ class BookmarkEditorGtk : public BookmarkEditor,
 
   // BookmarkModel observer methods. Any structural change results in
   // resetting the tree model.
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE {}
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE {}
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
                                  int old_index,
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc
index 903bff4..b073de6 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc
@@ -143,7 +143,8 @@ BookmarkSubMenuModel::~BookmarkSubMenuModel() {
     model()->RemoveObserver(this);
 }
 
-void BookmarkSubMenuModel::Loaded(BookmarkModel* model, bool ids_reassigned) {
+void BookmarkSubMenuModel::BookmarkModelLoaded(BookmarkModel* model,
+                                               bool ids_reassigned) {
   // For now, just close the menu when the bookmarks are finished loading.
   // TODO(mdm): it would be slicker to just populate the menu while it's open.
   BookmarkModelChanged();
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.h b/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.h
index 579beef..34994a5 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.h
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.h
@@ -93,12 +93,13 @@ class BookmarkSubMenuModel : public BookmarkNodeMenuModel,
   // See below; this is used to allow closing the menu when bookmarks change.
   void SetMenuGtk(MenuGtk* menu) { menu_ = menu; }
 
-  // From BookmarkModelObserver, BaseBookmarkModelObserver.
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  // BaseBookmarkModelObserver:
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelChanged() OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
 
-  // From MenuModel via BookmarkNodeMenuModel, SimpleMenuModel.
+  // BookmarkNodeMenuModel:
   virtual void MenuWillShow() OVERRIDE;
   virtual void MenuClosed() OVERRIDE;
   virtual void ActivatedAt(int index) OVERRIDE;
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index e333af3..18c4476 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -973,7 +973,8 @@ void BookmarkBarView::OnBookmarkBubbleHidden() {
   StopThrobbing(false);
 }
 
-void BookmarkBarView::Loaded(BookmarkModel* model, bool ids_reassigned) {
+void BookmarkBarView::BookmarkModelLoaded(BookmarkModel* model,
+                                          bool ids_reassigned) {
   // There should be no buttons. If non-zero it means Load was invoked more than
   // once, or we didn't properly clear things. Either of which shouldn't happen.
   DCHECK_EQ(0, GetBookmarkButtonCount());
@@ -1294,7 +1295,7 @@ void BookmarkBarView::Init() {
   if (model_) {
     model_->AddObserver(this);
     if (model_->loaded())
-      Loaded(model_, false);
+      BookmarkModelLoaded(model_, false);
     // else case: we'll receive notification back from the BookmarkModel when
     // done loading, then we'll populate the bar.
   }
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
index 38b9da6..6e166fa 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
@@ -200,7 +200,8 @@ class BookmarkBarView : public DetachableToolbarView,
   virtual void OnBookmarkBubbleHidden() OVERRIDE;
 
   // BookmarkModelObserver:
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
index 24ccd53..3bdf354 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
@@ -132,7 +132,8 @@ class BookmarkEditorView : public BookmarkEditor,
 
   // BookmarkModel observer methods. Any structural change results in
   // resetting the tree model.
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE {}
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE {}
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
                                  int old_index,
diff --git a/chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc b/chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc
index 83fe291..88ca506 100644
--- a/chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc
+++ b/chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc
@@ -346,7 +346,8 @@ void BookmarksHandler::SendResult(const base::DictionaryValue& result) {
   web_ui()->CallJavascriptFunction("ntp.bookmarks", result);
 }
 
-void BookmarksHandler::Loaded(BookmarkModel* model, bool ids_reassigned) {
+void BookmarksHandler::BookmarkModelLoaded(BookmarkModel* model,
+                                           bool ids_reassigned) {
   if (AreModelsLoaded())
     BookmarkModelChanged();
 }
diff --git a/chrome/browser/ui/webui/ntp/android/bookmarks_handler.h b/chrome/browser/ui/webui/ntp/android/bookmarks_handler.h
index 3094548..23e4669 100644
--- a/chrome/browser/ui/webui/ntp/android/bookmarks_handler.h
+++ b/chrome/browser/ui/webui/ntp/android/bookmarks_handler.h
@@ -69,7 +69,8 @@ class BookmarksHandler : public content::WebUIMessageHandler,
   void HandleCreateHomeScreenBookmarkShortcut(const base::ListValue* args);
 
   // Override the methods of BookmarkModelObserver
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelChanged() OVERRIDE;
   virtual void ExtensiveBookmarkChangesBeginning(BookmarkModel* model) OVERRIDE;
   virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) OVERRIDE;
diff --git a/chrome/browser/undo/bookmark_undo_service.cc b/chrome/browser/undo/bookmark_undo_service.cc
index 04fa0ff..bfaca32 100644
--- a/chrome/browser/undo/bookmark_undo_service.cc
+++ b/chrome/browser/undo/bookmark_undo_service.cc
@@ -401,7 +401,8 @@ void BookmarkUndoService::OnBookmarkRenumbered(int64 old_id, int64 new_id) {
   }
 }
 
-void BookmarkUndoService::Loaded(BookmarkModel* model, bool ids_reassigned) {
+void BookmarkUndoService::BookmarkModelLoaded(BookmarkModel* model,
+                                              bool ids_reassigned) {
   undo_manager_.RemoveAllOperations();
 }
 
diff --git a/chrome/browser/undo/bookmark_undo_service.h b/chrome/browser/undo/bookmark_undo_service.h
index 29cd95a..2404ece 100644
--- a/chrome/browser/undo/bookmark_undo_service.h
+++ b/chrome/browser/undo/bookmark_undo_service.h
@@ -34,7 +34,8 @@ class BookmarkUndoService : public BaseBookmarkModelObserver,
  private:
   // BaseBookmarkModelObserver:
   virtual void BookmarkModelChanged() OVERRIDE {}
-  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  virtual void BookmarkModelLoaded(BookmarkModel* model,
+                                   bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,