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

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

Issue 10947019: Constrained Window Cocoa: Disable fullscreen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 1717 matching lines...) Expand 10 before | Expand all | Expand 10 after
1728 // Browser, ConstrainedWindowTabHelperDelegate implementation: 1728 // Browser, ConstrainedWindowTabHelperDelegate implementation:
1729 1729
1730 void Browser::SetTabContentBlocked(TabContents* tab_contents, bool blocked) { 1730 void Browser::SetTabContentBlocked(TabContents* tab_contents, bool blocked) {
1731 int index = tab_strip_model_->GetIndexOfTabContents(tab_contents); 1731 int index = tab_strip_model_->GetIndexOfTabContents(tab_contents);
1732 if (index == TabStripModel::kNoTab) { 1732 if (index == TabStripModel::kNoTab) {
1733 NOTREACHED(); 1733 NOTREACHED();
1734 return; 1734 return;
1735 } 1735 }
1736 tab_strip_model_->SetTabBlocked(index, blocked); 1736 tab_strip_model_->SetTabBlocked(index, blocked);
1737 command_controller_->PrintingStateChanged(); 1737 command_controller_->PrintingStateChanged();
1738 command_controller_->FullscreenStateChanged();
1738 if (!blocked && chrome::GetActiveTabContents(this) == tab_contents) 1739 if (!blocked && chrome::GetActiveTabContents(this) == tab_contents)
1739 tab_contents->web_contents()->Focus(); 1740 tab_contents->web_contents()->Focus();
1740 } 1741 }
1741 1742
1742 /////////////////////////////////////////////////////////////////////////////// 1743 ///////////////////////////////////////////////////////////////////////////////
1743 // Browser, BlockedContentTabHelperDelegate implementation: 1744 // Browser, BlockedContentTabHelperDelegate implementation:
1744 1745
1745 TabContents* Browser::GetConstrainingTabContents(TabContents* source) { 1746 TabContents* Browser::GetConstrainingTabContents(TabContents* source) {
1746 return source; 1747 return source;
1747 } 1748 }
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
2281 if (contents && !allow_js_access) { 2282 if (contents && !allow_js_access) {
2282 contents->web_contents()->GetController().LoadURL( 2283 contents->web_contents()->GetController().LoadURL(
2283 target_url, 2284 target_url,
2284 content::Referrer(), 2285 content::Referrer(),
2285 content::PAGE_TRANSITION_LINK, 2286 content::PAGE_TRANSITION_LINK,
2286 std::string()); // No extra headers. 2287 std::string()); // No extra headers.
2287 } 2288 }
2288 2289
2289 return contents != NULL; 2290 return contents != NULL;
2290 } 2291 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser_command_controller.cc » ('j') | chrome/browser/ui/browser_command_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698