| 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 f4ea956bddfa70db299c9d616e331def4f255ba0..a08482fc3ae3b12ac0d308e2005ecd5eb21f5222 100644
|
| --- a/chrome/browser/ui/views/frame/browser_view.cc
|
| +++ b/chrome/browser/ui/views/frame/browser_view.cc
|
| @@ -22,9 +22,9 @@
|
| #include "chrome/browser/debugger/devtools_window.h"
|
| #include "chrome/browser/extensions/extension_tab_helper.h"
|
| #include "chrome/browser/instant/instant_controller.h"
|
| +#include "chrome/browser/managed_mode.h"
|
| #include "chrome/browser/native_window_notification_source.h"
|
| #include "chrome/browser/ntp_background_util.h"
|
| -#include "chrome/browser/managed_mode.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/profiles/avatar_menu_model.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| @@ -1092,7 +1092,7 @@ bool BrowserView::IsDownloadShelfVisible() const {
|
| DownloadShelf* BrowserView::GetDownloadShelf() {
|
| if (!download_shelf_.get()) {
|
| download_shelf_.reset(new DownloadShelfView(browser_.get(), this));
|
| - download_shelf_->set_parent_owned(false);
|
| + download_shelf_->set_owned_by_client();
|
| }
|
| return download_shelf_.get();
|
| }
|
| @@ -1896,7 +1896,7 @@ bool BrowserView::MaybeShowBookmarkBar(TabContentsWrapper* contents) {
|
| contents) {
|
| if (!bookmark_bar_view_.get()) {
|
| bookmark_bar_view_.reset(new BookmarkBarView(browser_.get()));
|
| - bookmark_bar_view_->set_parent_owned(false);
|
| + bookmark_bar_view_->set_owned_by_client();
|
| bookmark_bar_view_->set_background(
|
| new BookmarkExtensionBackground(this, bookmark_bar_view_.get(),
|
| browser_.get()));
|
|
|