Chromium Code Reviews| Index: chrome/browser/ui/views/frame/browser_view.cc |
| diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc |
| index 0324a59cdaba4cd95512bce4b57d048c39c90047..8e38e2ac21715d193fb531fbc64d8e17c6ac210e 100644 |
| --- a/chrome/browser/ui/views/frame/browser_view.cc |
| +++ b/chrome/browser/ui/views/frame/browser_view.cc |
| @@ -137,6 +137,7 @@ |
| #include "ui/aura/window.h" |
| #include "ui/gfx/screen.h" |
| #elif defined(OS_WIN) // !defined(USE_AURA) |
| +#include "chrome/browser/jumplist_listener.h" |
| #include "chrome/browser/jumplist_win.h" |
| #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h" |
| #include "ui/views/widget/native_widget_win.h" |
| @@ -2223,8 +2224,8 @@ void BrowserView::Init() { |
| // Create a custom JumpList and add it to an observer of TabRestoreService |
| // so we can update the custom JumpList when a tab is added or removed. |
| if (JumpList::Enabled()) { |
| - jumplist_ = new JumpList(); |
| - jumplist_->AddObserver(browser_->profile()); |
| + jumplist_listener_ .reset(new JumpListListener( |
|
sky
2012/12/18 20:52:38
You've got a space after jumplist_listener_
Cait (Slow)
2012/12/19 19:27:01
Done.
|
| + base::Bind(&BrowserView::CreateJumpList, base::Unretained(this)))); |
| } |
| #endif |
| @@ -2808,3 +2809,12 @@ void BrowserView::MaybeStackBookmarkBarAtTop() { |
| if (bookmark_bar_view_.get()) |
| bookmark_bar_view_->MaybeStackAtTop(); |
| } |
| + |
| +#if defined(OS_WIN) && !defined(USE_AURA) |
| +void BrowserView::CreateJumpList() { |
| + if (!jumplist_) { |
|
sky
2012/12/18 20:52:38
Why the if check here? It should be a DCHECK.
Cait (Slow)
2012/12/19 19:27:01
Done.
|
| + jumplist_ = new JumpList(); |
| + jumplist_->AddObserver(browser_->profile()); |
| + } |
| +} |
| +#endif |