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/views/bookmark_bar_view.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/views/bookmark_bar_view.h')
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h index 1f3e124..507da5d 100644 --- a/chrome/browser/views/bookmark_bar_view.h +++ b/chrome/browser/views/bookmark_bar_view.h @@ -309,16 +309,11 @@ class BookmarkBarView : public ChromeViews::View, // visible. Updates the preferences to match the users choice as appropriate. virtual void ExecuteCommand(int id); - // Notification that the HistoryService is up an running. Removes us as - // a listener on the notification service and invokes - // ProfileHasValidHistoryService. + // NotificationService method. virtual void Observe(NotificationType type, const NotificationSource& source, const NotificationDetails& details); - // Invoked when the profile has a history service. Recreates the models. - void ProfileHasValidHistoryService(); - // If we have registered an observer on the notification service, this // unregisters it. This does nothing if we have not installed ourself as an // observer. |