Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 8883038: Don't display the bookmark bar when in fullscreen mode. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // OS_WIN 10 #endif // OS_WIN
(...skipping 1381 matching lines...) Expand 10 before | Expand all | Expand 10 after
1392 browser::GetIndexOfSingletonTab(&local_params) < 0) { 1392 browser::GetIndexOfSingletonTab(&local_params) < 0) {
1393 local_params.disposition = CURRENT_TAB; 1393 local_params.disposition = CURRENT_TAB;
1394 } 1394 }
1395 } 1395 }
1396 1396
1397 browser::Navigate(&local_params); 1397 browser::Navigate(&local_params);
1398 } 1398 }
1399 1399
1400 void Browser::WindowFullscreenStateChanged() { 1400 void Browser::WindowFullscreenStateChanged() {
1401 fullscreen_controller_->WindowFullscreenStateChanged(); 1401 fullscreen_controller_->WindowFullscreenStateChanged();
1402 UpdateCommandsForFullscreenMode(window_->IsFullscreen());
1403 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN);
1402 } 1404 }
1403 1405
1404 /////////////////////////////////////////////////////////////////////////////// 1406 ///////////////////////////////////////////////////////////////////////////////
1405 // Browser, Assorted browser commands: 1407 // Browser, Assorted browser commands:
1406 1408
1407 TabContents* Browser::GetOrCloneTabForDisposition( 1409 TabContents* Browser::GetOrCloneTabForDisposition(
1408 WindowOpenDisposition disposition) { 1410 WindowOpenDisposition disposition) {
1409 TabContentsWrapper* current_tab = GetSelectedTabContentsWrapper(); 1411 TabContentsWrapper* current_tab = GetSelectedTabContentsWrapper();
1410 switch (disposition) { 1412 switch (disposition) {
1411 case NEW_FOREGROUND_TAB: 1413 case NEW_FOREGROUND_TAB:
(...skipping 2774 matching lines...) Expand 10 before | Expand all | Expand 10 after
4186 if (location_bar) 4188 if (location_bar)
4187 location_bar->UpdateContentSettingsIcons(); 4189 location_bar->UpdateContentSettingsIcons();
4188 } 4190 }
4189 break; 4191 break;
4190 } 4192 }
4191 4193
4192 case content::NOTIFICATION_INTERSTITIAL_ATTACHED: 4194 case content::NOTIFICATION_INTERSTITIAL_ATTACHED:
4193 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); 4195 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
4194 break; 4196 break;
4195 4197
4196 case chrome::NOTIFICATION_FULLSCREEN_CHANGED:
4197 UpdateCommandsForFullscreenMode(window_->IsFullscreen());
4198 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN);
4199 break;
4200
4201 default: 4198 default:
4202 NOTREACHED() << "Got a notification we didn't register for."; 4199 NOTREACHED() << "Got a notification we didn't register for.";
4203 } 4200 }
4204 } 4201 }
4205 4202
4206 /////////////////////////////////////////////////////////////////////////////// 4203 ///////////////////////////////////////////////////////////////////////////////
4207 // Browser, ProfileSyncServiceObserver implementation: 4204 // Browser, ProfileSyncServiceObserver implementation:
4208 4205
4209 void Browser::OnStateChanged() { 4206 void Browser::OnStateChanged() {
4210 DCHECK(profile_->GetProfileSyncService()); 4207 DCHECK(profile_->GetProfileSyncService());
(...skipping 1122 matching lines...) Expand 10 before | Expand all | Expand 10 after
5333 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); 5330 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type);
5334 } else { 5331 } else {
5335 GlobalErrorService* service = 5332 GlobalErrorService* service =
5336 GlobalErrorServiceFactory::GetForProfile(profile()); 5333 GlobalErrorServiceFactory::GetForProfile(profile());
5337 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); 5334 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView();
5338 if (error) { 5335 if (error) {
5339 error->ShowBubbleView(this); 5336 error->ShowBubbleView(this);
5340 } 5337 }
5341 } 5338 }
5342 } 5339 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698