Merge 166410 - Constrained Window Cocoa: Disable fullscreen

chrome/browser/ui/browser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 1766 matching lines @@
 
 void Browser::SetTabContentBlocked(content::WebContents* web_contents,
                                    bool blocked) {
   int index = tab_strip_model_->GetIndexOfWebContents(web_contents);
   if (index == TabStripModel::kNoTab) {
     NOTREACHED();
     return;
   }
   tab_strip_model_->SetTabBlocked(index, blocked);
   command_controller_->PrintingStateChanged();
+  command_controller_->FullscreenStateChanged();
   if (!blocked && chrome::GetActiveWebContents(this) == web_contents)
     web_contents->Focus();
 }
 
 bool Browser::GetConstrainedWindowTopCenter(gfx::Point* point) {
   int y = 0;
   if (window_->GetConstrainedWindowTopY(&y)) {
     *point = gfx::Point(window_->GetBounds().width() / 2, y);
     return true;
   }
@@ skipping 556 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }