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

Unified Diff: chrome/browser/extensions/extension_tabs_module.cc

Issue 9328037: Add fullscreen state support for chrome.windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Small fix Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_tabs_module.cc
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc
index 62e6c18be2dcf10e0a3a56f53b933a08ddfc398d..2c4c5534b9f5bf2defe90a896759f2f3eaf72ced 100644
--- a/chrome/browser/extensions/extension_tabs_module.cc
+++ b/chrome/browser/extensions/extension_tabs_module.cc
@@ -595,12 +595,18 @@ bool UpdateWindowFunction::RunImpl() {
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)
+ browser->window()->ExitFullscreen();
+
switch (show_state) {
case ui::SHOW_STATE_MINIMIZED:
browser->window()->Minimize();
@@ -608,6 +614,12 @@ bool UpdateWindowFunction::RunImpl() {
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(
Mihai Parparita -not on Chrome 2012/02/06 22:31:34 Aaron: should the ability to go fullscreen be tied
+ GURL(), FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION);
Mihai Parparita -not on Chrome 2012/02/06 22:31:34 This ends up displaying the "You have gone full sc
hashimoto 2012/02/07 02:16:00 Done. The message is now "<Extension Name> trigger
+ break;
case ui::SHOW_STATE_NORMAL:
browser->window()->Restore();
break;
@@ -654,7 +666,8 @@ bool UpdateWindowFunction::RunImpl() {
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;
}
@@ -672,7 +685,8 @@ bool UpdateWindowFunction::RunImpl() {
}
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;
}

Powered by Google App Engine
This is Rietveld 408576698