Chromium Code Reviews| Index: chrome/browser/ui/browser.cc |
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc |
| index 59da215e8a64393c96e250fa9841a81e9243d2b0..5aaa515aaa69716dbf616eef34c6d149ead7ccd5 100644 |
| --- a/chrome/browser/ui/browser.cc |
| +++ b/chrome/browser/ui/browser.cc |
| @@ -109,6 +109,7 @@ |
| #include "chrome/browser/ui/chrome_bubble_manager.h" |
| #include "chrome/browser/ui/chrome_pages.h" |
| #include "chrome/browser/ui/chrome_select_file_policy.h" |
| +#include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" |
| #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" |
| #include "chrome/browser/ui/exclusive_access/mouse_lock_controller.h" |
| #include "chrome/browser/ui/extensions/hosted_app_browser_controller.h" |
| @@ -434,6 +435,9 @@ Browser::Browser(const CreateParams& params) |
| bookmarks::prefs::kShowBookmarkBar, |
| base::Bind(&Browser::UpdateBookmarkBarState, base::Unretained(this), |
| BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE)); |
| + profile_pref_registrar_.Add( |
|
Robert Sesek
2016/02/26 20:42:27
Seems like this should be limited to OS_MACOSX? Bu
spqchan
2016/02/26 23:24:59
Good point. I was following what "Always Show Book
|
| + prefs::kShowFullscreenToolbar, |
| + base::Bind(&Browser::UpdateFullscreenToolbar, base::Unretained(this))); |
| // NOTE: These prefs all need to be explicitly destroyed in the destructor |
| // or you'll get a nasty surprise when you run the incognito tests. |
| @@ -2645,6 +2649,10 @@ void Browser::UpdateBookmarkBarState(BookmarkBarStateChangeReason reason) { |
| BookmarkBar::DONT_ANIMATE_STATE_CHANGE); |
| } |
| +void Browser::UpdateFullscreenToolbar() { |
| + exclusive_access_manager()->context()->UpdateFullscreenToolbar(); |
| +} |
| + |
| bool Browser::ShouldHideUIForFullscreen() const { |
| // Windows and GTK remove the top controls in fullscreen, but Mac and Ash |
| // keep the controls in a slide-down panel. |