diff options
31 files changed, 59 insertions, 64 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_provider.cc b/chrome/browser/autocomplete/autocomplete_provider.cc index f751fa2..98904cb0 100644 --- a/chrome/browser/autocomplete/autocomplete_provider.cc +++ b/chrome/browser/autocomplete/autocomplete_provider.cc @@ -144,7 +144,7 @@ void AutocompleteProvider::UpdateStarredStateOfMatches() { return; BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(profile_); - if (!bookmark_model || !bookmark_model->IsLoaded()) + if (!bookmark_model || !bookmark_model->loaded()) return; for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i) diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 73e957e..10972da 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -1280,7 +1280,7 @@ void TestingAutomationProvider::GetBookmarksAsJSON( } BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(browser->profile()); - if (!bookmark_model->IsLoaded()) { + if (!bookmark_model->loaded()) { reply.SendError("Bookmark model is not loaded"); return; } @@ -1307,7 +1307,7 @@ void TestingAutomationProvider::WaitForBookmarkModelToLoad( AutomationProviderBookmarkModelObserver* observer = new AutomationProviderBookmarkModelObserver(this, reply_message, model, false); - if (model->IsLoaded()) { + if (model->loaded()) { observer->ReleaseReply(); delete observer; AutomationMsg_WaitForBookmarkModelToLoad::WriteReplyParams( @@ -1331,7 +1331,7 @@ void TestingAutomationProvider::WaitForBookmarkModelToLoadJSON( AutomationProviderBookmarkModelObserver* observer = new AutomationProviderBookmarkModelObserver(this, reply_message, model, true); - if (model->IsLoaded()) { + if (model->loaded()) { observer->ReleaseReply(); delete observer; AutomationJSONReply(this, reply_message).SendSuccess(NULL); @@ -1374,7 +1374,7 @@ void TestingAutomationProvider::AddBookmark( } BookmarkModel* model = BookmarkModelFactory::GetForProfile(browser->profile()); - if (!model->IsLoaded()) { + if (!model->loaded()) { reply.SendError("Bookmark model is not loaded"); return; } @@ -1420,7 +1420,7 @@ void TestingAutomationProvider::ReparentBookmark(DictionaryValue* args, } BookmarkModel* model = BookmarkModelFactory::GetForProfile(browser->profile()); - if (!model->IsLoaded()) { + if (!model->loaded()) { reply.SendError("Bookmark model is not loaded"); return; } @@ -1459,7 +1459,7 @@ void TestingAutomationProvider::SetBookmarkTitle(DictionaryValue* args, } BookmarkModel* model = BookmarkModelFactory::GetForProfile(browser->profile()); - if (!model->IsLoaded()) { + if (!model->loaded()) { reply.SendError("Bookmark model is not loaded"); return; } @@ -1492,7 +1492,7 @@ void TestingAutomationProvider::SetBookmarkURL(DictionaryValue* args, } BookmarkModel* model = BookmarkModelFactory::GetForProfile(browser->profile()); - if (!model->IsLoaded()) { + if (!model->loaded()) { reply.SendError("Bookmark model is not loaded"); return; } @@ -1521,7 +1521,7 @@ void TestingAutomationProvider::RemoveBookmark(DictionaryValue* args, } BookmarkModel* model = BookmarkModelFactory::GetForProfile(browser->profile()); - if (!model->IsLoaded()) { + if (!model->loaded()) { reply.SendError("Bookmark model is not loaded"); return; } diff --git a/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc b/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc index 411e073..2874f22 100644 --- a/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc +++ b/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc @@ -30,7 +30,7 @@ void BookmarkExpandedStateTracker::SetExpandedNodes(const Nodes& nodes) { BookmarkExpandedStateTracker::Nodes BookmarkExpandedStateTracker::GetExpandedNodes() { Nodes nodes; - if (!bookmark_model_->IsLoaded()) + if (!bookmark_model_->loaded()) return nodes; PrefService* prefs = components::UserPrefs::Get(browser_context_); diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc index 1985c64..8983c01 100644 --- a/chrome/browser/bookmarks/bookmark_model.cc +++ b/chrome/browser/bookmarks/bookmark_model.cc @@ -255,10 +255,6 @@ void BookmarkModel::Load( store_->LoadBookmarks(CreateLoadDetails()); } -bool BookmarkModel::IsLoaded() const { - return loaded_; -} - const BookmarkNode* BookmarkModel::GetParentForNewNodes() { std::vector<const BookmarkNode*> nodes = bookmark_utils::GetMostRecentlyModifiedFolders(this, 1); diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h index 9853d38..dbb82e9 100644 --- a/chrome/browser/bookmarks/bookmark_model.h +++ b/chrome/browser/bookmarks/bookmark_model.h @@ -244,8 +244,7 @@ class BookmarkModel : public content::NotificationObserver, void Load(const scoped_refptr<base::SequencedTaskRunner>& task_runner); // Returns true if the model finished loading. - // This is virtual so it can be mocked. - virtual bool IsLoaded() const; + bool loaded() const { return loaded_; } // Returns the root node. The 'bookmark bar' node and 'other' node are // children of the root node. diff --git a/chrome/browser/bookmarks/bookmark_storage.cc b/chrome/browser/bookmarks/bookmark_storage.cc index 2be831a..431a6d1 100644 --- a/chrome/browser/bookmarks/bookmark_storage.cc +++ b/chrome/browser/bookmarks/bookmark_storage.cc @@ -167,7 +167,7 @@ void BookmarkStorage::OnLoadFinished() { } bool BookmarkStorage::SaveNow() { - if (!model_ || !model_->IsLoaded()) { + if (!model_ || !model_->loaded()) { // We should only get here if we have a valid model and it's finished // loading. NOTREACHED(); diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index 166576b..45c526a 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc @@ -90,7 +90,7 @@ base::FilePath GetDefaultFilepathForBookmarkExport() { void BookmarksFunction::Run() { BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile()); - if (!model->IsLoaded()) { + if (!model->loaded()) { // Bookmarks are not ready yet. We'll wait. model->AddObserver(this); AddRef(); // Balanced in Loaded(). diff --git a/chrome/browser/importer/external_process_importer_host.cc b/chrome/browser/importer/external_process_importer_host.cc index 15b0188..276c50e 100644 --- a/chrome/browser/importer/external_process_importer_host.cc +++ b/chrome/browser/importer/external_process_importer_host.cc @@ -67,7 +67,7 @@ void ExternalProcessImporterHost::InvokeTaskIfDone() { void ExternalProcessImporterHost::Loaded(BookmarkModel* model, bool ids_reassigned) { - DCHECK(model->IsLoaded()); + DCHECK(model->loaded()); model->RemoveObserver(this); waiting_for_bookmarkbar_model_ = false; installed_bookmark_observer_ = false; diff --git a/chrome/browser/importer/importer_host.cc b/chrome/browser/importer/importer_host.cc index 59deb0c..4cf8ab1 100644 --- a/chrome/browser/importer/importer_host.cc +++ b/chrome/browser/importer/importer_host.cc @@ -249,7 +249,7 @@ void ImporterHost::InvokeTaskIfDone() { } void ImporterHost::Loaded(BookmarkModel* model, bool ids_reassigned) { - DCHECK(model->IsLoaded()); + DCHECK(model->loaded()); model->RemoveObserver(this); waiting_for_bookmarkbar_model_ = false; installed_bookmark_observer_ = false; diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc index 8124263..45e05ba 100644 --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc @@ -86,7 +86,7 @@ bool ProfileWriter::BookmarkEntry::operator==( ProfileWriter::ProfileWriter(Profile* profile) : profile_(profile) {} bool ProfileWriter::BookmarkModelIsLoaded() const { - return BookmarkModelFactory::GetForProfile(profile_)->IsLoaded(); + return BookmarkModelFactory::GetForProfile(profile_)->loaded(); } bool ProfileWriter::TemplateURLServiceIsLoaded() const { @@ -127,7 +127,7 @@ void ProfileWriter::AddBookmarks(const std::vector<BookmarkEntry>& bookmarks, return; BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile_); - DCHECK(model->IsLoaded()); + DCHECK(model->loaded()); // If the bookmark bar is currently empty, we should import directly to it. // Otherwise, we should import everything to a subfolder. diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc index 0f22b2b..9446303 100644 --- a/chrome/browser/sync/glue/bookmark_change_processor.cc +++ b/chrome/browser/sync/glue/bookmark_change_processor.cc @@ -62,7 +62,7 @@ void BookmarkChangeProcessor::StartImpl(Profile* profile) { profile_ = profile; DCHECK(!bookmark_model_); bookmark_model_ = BookmarkModelFactory::GetForProfile(profile); - DCHECK(bookmark_model_->IsLoaded()); + DCHECK(bookmark_model_->loaded()); bookmark_model_->AddObserver(this); } diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller.cc b/chrome/browser/sync/glue/bookmark_data_type_controller.cc index a4e7503..f8958c4 100644 --- a/chrome/browser/sync/glue/bookmark_data_type_controller.cc +++ b/chrome/browser/sync/glue/bookmark_data_type_controller.cc @@ -92,7 +92,7 @@ void BookmarkDataTypeController::BookmarkModelChanged() { void BookmarkDataTypeController::Loaded(BookmarkModel* model, bool ids_reassigned) { - DCHECK(model->IsLoaded()); + DCHECK(model->loaded()); model->RemoveObserver(this); installed_bookmark_observer_ = false; @@ -111,7 +111,7 @@ void BookmarkDataTypeController::BookmarkModelBeingDeleted( // Check that both the bookmark model and the history service (for favicons) // are loaded. bool BookmarkDataTypeController::DependentsLoaded() { - if (!bookmark_model_ || !bookmark_model_->IsLoaded()) + if (!bookmark_model_ || !bookmark_model_->loaded()) return false; HistoryService* history = HistoryServiceFactory::GetForProfile( diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc index dfcc823..fe443fe 100644 --- a/chrome/browser/sync/glue/bookmark_model_associator.cc +++ b/chrome/browser/sync/glue/bookmark_model_associator.cc @@ -213,7 +213,7 @@ BookmarkModelAssociator::~BookmarkModelAssociator() { void BookmarkModelAssociator::UpdatePermanentNodeVisibility() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - DCHECK(bookmark_model_->IsLoaded()); + DCHECK(bookmark_model_->loaded()); bookmark_model_->SetPermanentNodeVisible( BookmarkNode::MOBILE, @@ -393,7 +393,7 @@ syncer::SyncError BookmarkModelAssociator::BuildAssociations( // This algorithm will not do well if the folder name has changes but the // children under them are all the same. - DCHECK(bookmark_model_->IsLoaded()); + DCHECK(bookmark_model_->loaded()); // To prime our association, we associate the top-level nodes, Bookmark Bar // and Other Bookmarks. diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc index 1d6cedc..e0821df 100644 --- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc +++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc @@ -44,7 +44,7 @@ BookmarkContextMenuController::BookmarkContextMenuController( selection_(selection), model_(BookmarkModelFactory::GetForProfile(profile)) { DCHECK(profile_); - DCHECK(model_->IsLoaded()); + DCHECK(model_->loaded()); menu_model_.reset(new ui::SimpleMenuModel(this)); model_->AddObserver(this); diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc index 2e4bd31..e6df9f0 100644 --- a/chrome/browser/ui/bookmarks/bookmark_utils.cc +++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc @@ -207,7 +207,7 @@ bool ConfirmDeleteBookmarkNode(const BookmarkNode* node, void ShowBookmarkAllTabsDialog(Browser* browser) { Profile* profile = browser->profile(); BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile); - DCHECK(model && model->IsLoaded()); + DCHECK(model && model->loaded()); const BookmarkNode* parent = model->GetParentForNewNodes(); BookmarkEditor::EditDetails details = diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc index 2419e6e..27da5db 100644 --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc @@ -104,7 +104,7 @@ void BookmarkCurrentPageInternal(Browser* browser, bool from_star) { BookmarkModel* model = BookmarkModelFactory::GetForProfile(browser->profile()); - if (!model || !model->IsLoaded()) + if (!model || !model->loaded()) return; // Ignore requests until bookmarks are loaded. GURL url; @@ -653,7 +653,7 @@ bool CanBookmarkCurrentPage(const Browser* browser) { return browser_defaults::bookmarks_enabled && browser->profile()->GetPrefs()->GetBoolean( prefs::kEditBookmarksEnabled) && - model && model->IsLoaded() && browser->is_type_tabbed(); + model && model->loaded() && browser->is_type_tabbed(); } void BookmarkAllTabs(Browser* browser) { diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm b/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm index 52a2136..49fcc06 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm @@ -120,7 +120,7 @@ } BookmarkModel* model = BookmarkModelFactory::GetForProfile(lastProfile); - if (!model->IsLoaded()) { + if (!model->loaded()) { AppleScript::SetError(AppleScript::errBookmarkModelLoad); return NULL; } diff --git a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm index b45b4b7..d6e3326 100644 --- a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm @@ -79,7 +79,7 @@ } BookmarkModel* model = BookmarkModelFactory::GetForProfile(lastProfile); - if (!model->IsLoaded()) { + if (!model->loaded()) { AppleScript::SetError(AppleScript::errBookmarkModelLoad); return nil; } @@ -102,7 +102,7 @@ } BookmarkModel* model = BookmarkModelFactory::GetForProfile(lastProfile); - if (!model->IsLoaded()) { + if (!model->loaded()) { AppleScript::SetError(AppleScript::errBookmarkModelLoad); return NULL; } diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm index 1ded574..dd3dec4 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->IsLoaded()) + if (model->loaded()) Loaded(model, false); profile_pref_registrar_.Init(profile->GetPrefs()); diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index bd896f7..d8c72f0 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -1158,7 +1158,7 @@ void RecordAppLaunch(Profile* profile, GURL url) { if (!appsPageShortcutButton_.get()) return NO; - BOOL visible = bookmarkModel_->IsLoaded() && + BOOL visible = bookmarkModel_->loaded() && chrome::ShouldShowAppsShortcutInBookmarkBar(browser_->profile()); [appsPageShortcutButton_ setHidden:!visible]; return visible; @@ -1678,7 +1678,7 @@ void RecordAppLaunch(Profile* profile, GURL url) { // Called when our controlled frame has changed size. - (void)frameDidChange { - if (!bookmarkModel_->IsLoaded()) + if (!bookmarkModel_->loaded()) return; [self updateTheme:[[[self view] window] themeProvider]]; [self reconfigureBookmarkBar]; @@ -2013,7 +2013,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) { // TODO(jrg): for now this is brute force. - (void)loaded:(BookmarkModel*)model { DCHECK(model == bookmarkModel_); - if (!model->IsLoaded()) + if (!model->loaded()) return; // If this is a rebuild request while we have a folder open, close it. 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 a730352..ae0a3ff 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 @@ -85,7 +85,7 @@ class BookmarkContextMenuDelegateBridge : - (NSMenu*)menuForBookmarkNode:(const BookmarkNode*)node { // Depending on timing, the model may not yet have been loaded. BookmarkModel* bookmarkModel = [bookmarkBarController_ bookmarkModel]; - if (!bookmarkModel || !bookmarkModel->IsLoaded()) + if (!bookmarkModel || !bookmarkModel->loaded()) return nil; // This may be called before the BMB view has been added to the window. In diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm index 009df03..1c2f80b 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm @@ -60,7 +60,7 @@ void BookmarkMenuBridge::UpdateMenuInternal(NSMenu* bookmark_menu, return; BookmarkModel* model = GetBookmarkModel(); - if (!model || !model->IsLoaded()) + if (!model || !model->loaded()) return; if (!folder_image_) { @@ -168,7 +168,7 @@ void BookmarkMenuBridge::BuildMenu() { void BookmarkMenuBridge::ObserveBookmarkModel() { BookmarkModel* model = GetBookmarkModel(); model->AddObserver(this); - if (model->IsLoaded()) + if (model->loaded()) Loaded(model, false); } diff --git a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm index 4f4276c..c2adc13 100644 --- a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm +++ b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm @@ -58,7 +58,7 @@ class ViewIDTest : public InProcessBrowserTest { BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(browser()->profile()); if (bookmark_model) { - if (!bookmark_model->IsLoaded()) + if (!bookmark_model->loaded()) ui_test_utils::WaitForBookmarkModelToLoad(bookmark_model); bookmark_utils::AddIfNotBookmarked( diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc index e76ec1e..e6d3bb7 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc @@ -288,7 +288,7 @@ void BookmarkBarGtk::Init() { // TODO(erg): Handle extensions model_ = BookmarkModelFactory::GetForProfile(profile); model_->AddObserver(this); - if (model_->IsLoaded()) + if (model_->loaded()) Loaded(model_, false); // else case: we'll receive notification back from the BookmarkModel when done // loading, then we'll populate the bar. @@ -437,7 +437,7 @@ void BookmarkBarGtk::Show(BookmarkBar::State old_state, AnimationProgressed(&slide_animation_); } - if (model_ && model_->IsLoaded()) + if (model_ && model_->loaded()) UpdateOtherBookmarksVisibility(); // Hide out behind the findbar. This is rather fragile code, it could @@ -978,7 +978,7 @@ void BookmarkBarGtk::Observe(int type, const content::NotificationSource& source, const content::NotificationDetails& details) { if (type == chrome::NOTIFICATION_BROWSER_THEME_CHANGED) { - if (model_ && model_->IsLoaded()) { + if (model_ && model_->loaded()) { // Regenerate the bookmark bar with all new objects with their theme // properties set correctly for the new theme. ResetButtons(); @@ -1114,7 +1114,7 @@ const BookmarkNode* BookmarkBarGtk::GetNodeForToolButton(GtkWidget* widget) { void BookmarkBarGtk::PopupMenuForNode(GtkWidget* sender, const BookmarkNode* node, GdkEventButton* event) { - if (!model_->IsLoaded()) { + if (!model_->loaded()) { // Don't do anything if the model isn't loaded. return; } diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc index 09e3bdd..420afd3 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc @@ -524,7 +524,7 @@ string16 BookmarkEditorGtk::GetInputTitle() const { } void BookmarkEditorGtk::ApplyEdits() { - DCHECK(bb_model_->IsLoaded()); + DCHECK(bb_model_->loaded()); GtkTreeIter currently_selected_iter; if (show_tree_) { 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 bc65042..19cb080 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 @@ -174,7 +174,7 @@ void BookmarkSubMenuModel::MenuWillShow() { model()->AddObserver(this); } // We can't do anything further if the model isn't loaded yet. - if (!model()->IsLoaded()) + if (!model()->loaded()) return; // The node count includes the node itself, so 1 means empty. if (model()->bookmark_bar_node()->GetTotalNodeCount() > 1) { diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index b7432da..75e7028 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -785,7 +785,7 @@ void BookmarkBarView::PaintChildren(gfx::Canvas* canvas) { bool BookmarkBarView::GetDropFormats( int* formats, std::set<ui::OSExchangeData::CustomFormat>* custom_formats) { - if (!model_ || !model_->IsLoaded()) + if (!model_ || !model_->loaded()) return false; *formats = ui::OSExchangeData::URL; custom_formats->insert(BookmarkNodeData::GetBookmarkCustomFormat()); @@ -797,7 +797,7 @@ bool BookmarkBarView::AreDropTypesRequired() { } bool BookmarkBarView::CanDrop(const ui::OSExchangeData& data) { - if (!model_ || !model_->IsLoaded() || + if (!model_ || !model_->loaded() || !browser_->profile()->GetPrefs()->GetBoolean( prefs::kEditBookmarksEnabled)) return false; @@ -1221,7 +1221,7 @@ void BookmarkBarView::ButtonPressed(views::Button* sender, void BookmarkBarView::ShowContextMenuForView(views::View* source, const gfx::Point& point) { - if (!model_->IsLoaded()) { + if (!model_->loaded()) { // Don't do anything if the model isn't loaded. return; } @@ -1299,7 +1299,7 @@ void BookmarkBarView::Init() { model_ = BookmarkModelFactory::GetForProfile(browser_->profile()); if (model_) { model_->AddObserver(this); - if (model_->IsLoaded()) + if (model_->loaded()) Loaded(model_, false); // else case: we'll receive notification back from the BookmarkModel when // done loading, then we'll populate the bar. @@ -1530,7 +1530,7 @@ void BookmarkBarView::CalculateDropLocation(const DropTargetEvent& event, const BookmarkNodeData& data, DropLocation* location) { DCHECK(model_); - DCHECK(model_->IsLoaded()); + DCHECK(model_->loaded()); DCHECK(data.is_valid()); *location = DropLocation(); @@ -1778,7 +1778,7 @@ gfx::Size BookmarkBarView::LayoutItems(bool compute_bounds_only) { } // Then go through the bookmark buttons. - if (GetBookmarkButtonCount() == 0 && model_ && model_->IsLoaded()) { + if (GetBookmarkButtonCount() == 0 && model_ && model_->loaded()) { gfx::Size pref = instructions_->GetPreferredSize(); if (!compute_bounds_only) { instructions_->SetBounds( diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index b1a0109..f3ff2b6 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -94,7 +94,7 @@ string16 BookmarkEditorView::GetDialogButtonLabel( bool BookmarkEditorView::IsDialogButtonEnabled(ui::DialogButton button) const { if (button == ui::DIALOG_BUTTON_OK) { - if (!bb_model_->IsLoaded()) + if (!bb_model_->loaded()) return false; if (details_.GetNodeType() != BookmarkNode::FOLDER) @@ -220,7 +220,7 @@ void BookmarkEditorView::ExecuteCommand(int command_id, int event_flags) { void BookmarkEditorView::Show(gfx::NativeWindow parent) { views::DialogDelegateView::CreateDialogWidget(this, NULL, parent); UserInputChanged(); - if (show_tree_ && bb_model_->IsLoaded()) + if (show_tree_ && bb_model_->loaded()) ExpandAndSelect(); GetWidget()->Show(); // Select all the text in the name Textfield. @@ -353,7 +353,7 @@ void BookmarkEditorView::Init() { layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); - if (!show_tree_ || bb_model_->IsLoaded()) + if (!show_tree_ || bb_model_->loaded()) Reset(); } @@ -519,7 +519,7 @@ BookmarkEditorView::EditorNode* BookmarkEditorView::FindNodeWithID( } void BookmarkEditorView::ApplyEdits() { - DCHECK(bb_model_->IsLoaded()); + DCHECK(bb_model_->loaded()); if (tree_view_) tree_view_->CommitEdit(); diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc index 17b1369..3c1054c 100644 --- a/chrome/browser/ui/views/wrench_menu.cc +++ b/chrome/browser/ui/views/wrench_menu.cc @@ -1156,9 +1156,9 @@ void WrenchMenu::CreateBookmarkMenu() { if (bookmark_menu_delegate_.get()) return; // Already created the menu. - BookmarkModel* model = BookmarkModelFactory::GetForProfile( - browser_->profile()); - if (!model->IsLoaded()) + BookmarkModel* model = + BookmarkModelFactory::GetForProfile(browser_->profile()); + if (!model->loaded()) return; model->AddObserver(this); diff --git a/chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc b/chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc index e6a0e81..b2f2f12 100644 --- a/chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc +++ b/chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc @@ -144,7 +144,7 @@ void BookmarksHandler::HandleGetBookmarks(const ListValue* args) { bookmark_data_requested_ = true; Profile* profile = Profile::FromBrowserContext( web_ui()->GetWebContents()->GetBrowserContext()); - if (!BookmarkModelFactory::GetForProfile(profile)->IsLoaded()) + if (!BookmarkModelFactory::GetForProfile(profile)->loaded()) return; // is handled in Loaded(). // Attach the Partner Bookmarks shim under the Mobile Bookmarks. diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index 822b1fd..a85ba0e 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -417,14 +417,14 @@ void RegisterAndWait(content::NotificationObserver* observer, } void WaitForBookmarkModelToLoad(BookmarkModel* model) { - if (model->IsLoaded()) + if (model->loaded()) return; base::RunLoop run_loop; BookmarkLoadObserver observer(content::GetQuitTaskForRunLoop(&run_loop)); model->AddObserver(&observer); content::RunThisRunLoop(&run_loop); model->RemoveObserver(&observer); - ASSERT_TRUE(model->IsLoaded()); + ASSERT_TRUE(model->loaded()); } void WaitForBookmarkModelToLoad(Profile* profile) { |