Add fullscreen state support for chrome.windows

chrome/browser/extensions/extension_tabs_module.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/extensions/extension_tabs_module.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 577 matching lines @@
   std::string state_str;
   if (update_props->HasKey(keys::kShowStateKey)) {
     EXTENSION_FUNCTION_VALIDATE(update_props->GetString(keys::kShowStateKey,
                                                         &state_str));
     if (state_str == keys::kShowStateValueNormal) {
       show_state = ui::SHOW_STATE_NORMAL;
     } else if (state_str == keys::kShowStateValueMinimized) {
       show_state = ui::SHOW_STATE_MINIMIZED;
     } else if (state_str == keys::kShowStateValueMaximized) {
       show_state = ui::SHOW_STATE_MAXIMIZED;
+    } else if (state_str == keys::kShowStateValueFullscreen) {
+      show_state = ui::SHOW_STATE_FULLSCREEN;
     } else {
       error_ = keys::kInvalidWindowStateError;
       return false;
     }
   }
 
+  if (browser->window()->IsFullscreen() &&
+      show_state != ui::SHOW_STATE_FULLSCREEN &&
+      show_state != ui::SHOW_STATE_DEFAULT)
+    browser->window()->ExitFullscreen();
+
   switch (show_state) {
     case ui::SHOW_STATE_MINIMIZED:
       browser->window()->Minimize();
       break;
     case ui::SHOW_STATE_MAXIMIZED:
       browser->window()->Maximize();
       break;
+    case ui::SHOW_STATE_FULLSCREEN:
+      if (browser->window()->IsMinimized() || browser->window()->IsMaximized())
+        browser->window()->Restore();
+      browser->window()->EnterFullscreen(

[yzshen1, 2012/02/07 07:57:22]

I am a little bit surprised that this doesn't need to talk with
fullscreen_controller. Are you sure that this is intended?

[hashimoto, 2012/02/07 11:53:17]

I thought calling Enter/ExitFullscreen is enough but using FulscreenController
is more consistent with other code.
Made a separated patch, PTAL http://codereview.chromium.org/9353010/

+          GetExtension()->url(),
+          FEB_TYPE_BROWSER_EXTENSION_TRIGGERED_FULLSCREEN_EXIT_INSTRUCTION);
+      break;
     case ui::SHOW_STATE_NORMAL:
       browser->window()->Restore();
       break;
     default:
       break;
   }
 
   gfx::Rect bounds = browser->window()->GetRestoredBounds();
   bool set_bounds = false;
 
@@ skipping 26 matching lines @@
   if (update_props->HasKey(keys::kHeightKey)) {
     EXTENSION_FUNCTION_VALIDATE(update_props->GetInteger(
         keys::kHeightKey,
         &bounds_val));
     bounds.set_height(bounds_val);
     set_bounds = true;
   }
 
   if (set_bounds) {
     if (show_state == ui::SHOW_STATE_MINIMIZED ||
-        show_state == ui::SHOW_STATE_MAXIMIZED) {
+        show_state == ui::SHOW_STATE_MAXIMIZED ||
+        show_state == ui::SHOW_STATE_FULLSCREEN) {
       error_ = keys::kInvalidWindowStateError;
       return false;
     }
     browser->window()->SetBounds(bounds);
   }
 
   bool active_val = false;
   if (update_props->HasKey(keys::kFocusedKey)) {
     EXTENSION_FUNCTION_VALIDATE(update_props->GetBoolean(
         keys::kFocusedKey, &active_val));
     if (active_val) {
       if (show_state == ui::SHOW_STATE_MINIMIZED) {
         error_ = keys::kInvalidWindowStateError;
         return false;
       }
       browser->window()->Activate();
     } else {
-      if (show_state == ui::SHOW_STATE_MAXIMIZED) {
+      if (show_state == ui::SHOW_STATE_MAXIMIZED ||
+          show_state == ui::SHOW_STATE_FULLSCREEN) {
         error_ = keys::kInvalidWindowStateError;
         return false;
       }
       browser->window()->Deactivate();
     }
   }
 
   bool draw_attention = false;
   if (update_props->HasKey(keys::kDrawAttentionKey)) {
     EXTENSION_FUNCTION_VALIDATE(update_props->GetBoolean(
@@ skipping 1022 matching lines @@
   // called for every API call the extension made.
   GotLanguage(language);
 }
 
 void DetectTabLanguageFunction::GotLanguage(const std::string& language) {
   result_.reset(Value::CreateStringValue(language.c_str()));
   SendResponse(true);
 
   Release();  // Balanced in Run()
 }