diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 21:50:10 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 21:50:10 +0000 |
| commit | d39859ae0b74ba856496a43e29a46dc59222761a (patch) | |
| tree | e45f2801ae69e9663a1f710cea83ac290d3551fb /chrome/browser/importer/profile_writer.cc | |
| parent | 1d359d78320edfb29f109405238ead030b480248 (diff) | |
| download | chromium_src-d39859ae0b74ba856496a43e29a46dc59222761a.zip chromium_src-d39859ae0b74ba856496a43e29a46dc59222761a.tar.gz chromium_src-d39859ae0b74ba856496a43e29a46dc59222761a.tar.bz2 | |
bookmarks: Make BookmarkModel::IsLoaded() not virtual.
BookmarkModel is not intended to be mocked out nor inherited from. Making
IsLoaded() a virtual function allow clients to inherit from BookmarkModel and
override its behavior, but that is not what we want and thus we make it
non-virtual.
Since r184651, nobody inherits from BookmarkModel nor override IsLoaded().
Also while at it, rename it to just loaded() and inline it in the header file,
since it's a only a trivial getter.
BUG=None
R=sky@chromium.org
Review URL: https://codereview.chromium.org/15012013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199021 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer/profile_writer.cc')
| -rw-r--r-- | chrome/browser/importer/profile_writer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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. |