diff options
| author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-04 03:35:33 +0000 |
|---|---|---|
| committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-04 03:35:33 +0000 |
| commit | c919469b3dfc6ea110fdc2218c014599babfd6e9 (patch) | |
| tree | 648bd6033dc8bd83c69f1275bae3e0da4b893051 /chrome/browser/profile.h | |
| parent | 023b66d1d8e7fcb99a6ae7dfbed1ce998d3c6882 (diff) | |
| download | chromium_src-c919469b3dfc6ea110fdc2218c014599babfd6e9.zip chromium_src-c919469b3dfc6ea110fdc2218c014599babfd6e9.tar.gz chromium_src-c919469b3dfc6ea110fdc2218c014599babfd6e9.tar.bz2 | |
Fixes crash in BookmarkBarView. If the HistoryService fails to load it
was possible for BookmarkBarView to deref NULL (the model_
field). There is no point in having the BookmarkBarView wait for
history to load now though, so I've taken this out which makes it
impossible to get in this situation.
BUG=1356168
TEST=make sure bookmarks still work correctly
Review URL: http://codereview.chromium.org/426
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1709 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.h')
| -rw-r--r-- | chrome/browser/profile.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/chrome/browser/profile.h b/chrome/browser/profile.h index 238ce41..9e5adf2 100644 --- a/chrome/browser/profile.h +++ b/chrome/browser/profile.h @@ -110,14 +110,6 @@ class Profile { // the ServiceAccessType definition above. virtual HistoryService* GetHistoryService(ServiceAccessType access) = 0; - // Returns true if the history service has been initialized. Some callers may - // want to use the history service for not very important things, and do not - // want to be the ones who cause lazy initialization of the service (can cause - // startup regressions). - // - // If this returns true, history_service() is guaranteed to return non-NULL. - virtual bool HasHistoryService() const = 0; - // Returns the WebDataService for this profile. This is owned by // the Profile. Callers that outlive the life of this profile need to be // sure they refcount the returned value. @@ -253,7 +245,6 @@ class ProfileImpl : public Profile { virtual Profile* GetOriginalProfile(); virtual VisitedLinkMaster* GetVisitedLinkMaster(); virtual HistoryService* GetHistoryService(ServiceAccessType sat); - virtual bool HasHistoryService() const; virtual WebDataService* GetWebDataService(ServiceAccessType sat); virtual PrefService* GetPrefs(); virtual TemplateURLModel* GetTemplateURLModel(); |