Revert 141723 - First pass at making Chrome support metro snap mode. It creates a fullscreen-alike …

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 173 matching lines @@
 #include "ui/base/animation/animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/point.h"
 #include "webkit/glue/web_intent_data.h"
 #include "webkit/glue/web_intent_service_data.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/window_open_disposition.h"
 #include "webkit/plugins/webplugininfo.h"
 
 #if defined(OS_WIN)
-#include "base/win/metro.h"
 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "ui/base/win/shell.h"
 #endif  // OS_WIN
 
 #if defined(OS_MACOSX)
 #include "ui/base/cocoa/find_pasteboard.h"
@@ skipping 1082 matching lines @@
   browser::NavigateParams params(
       this, url, content::PAGE_TRANSITION_AUTO_BOOKMARK);
   params.disposition = SINGLETON_TAB;
   params.window_action = browser::NavigateParams::SHOW_WINDOW;
   params.user_gesture = true;
   return params;
 }
 
 void Browser::WindowFullscreenStateChanged() {
   fullscreen_controller_->WindowFullscreenStateChanged();
-  FullScreenMode fullscreen_mode = FULLSCREEN_DISABLED;
-  if (window_->IsFullscreen()) {
-#if defined(OS_WIN)
-    fullscreen_mode = window_->IsInMetroSnapMode() ? FULLSCREEN_METRO_SNAP :
-                                                     FULLSCREEN_NORMAL;
-#else
-    fullscreen_mode = FULLSCREEN_NORMAL;
-#endif
-  }
-  UpdateCommandsForFullscreenMode(fullscreen_mode);
+  UpdateCommandsForFullscreenMode(window_->IsFullscreen());
   UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, Assorted browser commands:
 
 bool Browser::CanGoBack() const {
   return GetActiveWebContents()->GetController().CanGoBack();
 }
 
@@ skipping 1187 matching lines @@
     case IDC_SELECT_TAB_5:
     case IDC_SELECT_TAB_6:
     case IDC_SELECT_TAB_7:          SelectNumberedTab(id - IDC_SELECT_TAB_0);
                                                                       break;
     case IDC_SELECT_LAST_TAB:       SelectLastTab();                  break;
     case IDC_DUPLICATE_TAB:         DuplicateTab();                   break;
     case IDC_RESTORE_TAB:           RestoreTab();                     break;
     case IDC_COPY_URL:              WriteCurrentURLToClipboard();     break;
     case IDC_SHOW_AS_TAB:           ConvertPopupToTabbedBrowser();    break;
     case IDC_FULLSCREEN:            ToggleFullscreenMode();           break;
-#if defined(OS_WIN)
-    case IDC_METRO_SNAP_ENABLE:     SetMetroSnapMode(true);           break;
-    case IDC_METRO_SNAP_DISABLE:    SetMetroSnapMode(false);          break;
-#endif
 #if defined(OS_MACOSX)
     case IDC_PRESENTATION_MODE:     TogglePresentationMode();         break;
 #endif
     case IDC_EXIT:                  Exit();                           break;
 
     // Page-related commands
     case IDC_SAVE_PAGE:             SavePage();                       break;
     case IDC_BOOKMARK_PAGE:         BookmarkCurrentPage();            break;
     case IDC_PIN_TO_START_SCREEN:   PinCurrentPageToStartScreen();    break;
     case IDC_BOOKMARK_ALL_TABS:     BookmarkAllTabs();                break;
@@ skipping 1638 matching lines @@
   command_updater_.UpdateCommandEnabled(IDC_MOVE_TAB_PREVIOUS, normal_window);
   command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_0, normal_window);
   command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_1, normal_window);
   command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_2, normal_window);
   command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_3, normal_window);
   command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_4, normal_window);
   command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_5, normal_window);
   command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_6, normal_window);
   command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_7, normal_window);
   command_updater_.UpdateCommandEnabled(IDC_SELECT_LAST_TAB, normal_window);
-#if defined(OS_WIN)
-  const bool metro_mode = (base::win::GetMetroModule() != NULL);
-  command_updater_.UpdateCommandEnabled(IDC_METRO_SNAP_ENABLE, metro_mode);
-  command_updater_.UpdateCommandEnabled(IDC_METRO_SNAP_DISABLE, metro_mode);
-#endif
 #if defined(OS_MACOSX)
   command_updater_.UpdateCommandEnabled(IDC_TABPOSE, normal_window);
   command_updater_.UpdateCommandEnabled(IDC_PRESENTATION_MODE,
       !(is_type_panel() && is_app()));
 #endif
 
   // Clipboard commands
   command_updater_.UpdateCommandEnabled(IDC_COPY_URL, !is_devtools());
 
   // Find-in-page
@@ skipping 11 matching lines @@
   command_updater_.UpdateCommandEnabled(IDC_VIEW_INCOMPATIBILITIES, true);
 
   // View Background Pages entry is always enabled, but is hidden if there are
   // no background pages.
   command_updater_.UpdateCommandEnabled(IDC_VIEW_BACKGROUND_PAGES, true);
 
   // Toggle speech input
   command_updater_.UpdateCommandEnabled(IDC_TOGGLE_SPEECH_INPUT, true);
 
   // Initialize other commands whose state changes based on fullscreen mode.
-  UpdateCommandsForFullscreenMode(FULLSCREEN_DISABLED);
+  UpdateCommandsForFullscreenMode(false);
 
   UpdateCommandsForContentRestrictionState();
 
   UpdateCommandsForBookmarkEditing();
 
   UpdateCommandsForIncognitoAvailability();
 }
 
 void Browser::UpdateCommandsForIncognitoAvailability() {
   IncognitoModePrefs::Availability incognito_availability =
@@ skipping 119 matching lines @@
   command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_BAR,
       browser_defaults::bookmarks_enabled &&
       !profile_->GetPrefs()->IsManagedPreference(prefs::kShowBookmarkBar) &&
       show_main_ui);
 }
 
 void Browser::MarkHomePageAsChanged(PrefService* pref_service) {
   pref_service->SetBoolean(prefs::kHomePageChanged, true);
 }
 
-void Browser::UpdateCommandsForFullscreenMode(FullScreenMode fullscreen_mode) {
-  const bool show_main_ui =
-      IsShowingMainUI(fullscreen_mode != FULLSCREEN_DISABLED);
-  bool main_not_fullscreen = show_main_ui &&
-                             (fullscreen_mode == FULLSCREEN_DISABLED);
+void Browser::UpdateCommandsForFullscreenMode(bool is_fullscreen) {
+  const bool show_main_ui = IsShowingMainUI(is_fullscreen);
+  bool main_not_fullscreen = show_main_ui && !is_fullscreen;
 
   // Navigation commands
   command_updater_.UpdateCommandEnabled(IDC_OPEN_CURRENT_URL, show_main_ui);
 
   // Window management commands
   command_updater_.UpdateCommandEnabled(IDC_SHOW_AS_TAB,
-      type_ != TYPE_TABBED && (fullscreen_mode == FULLSCREEN_DISABLED));
+      type_ != TYPE_TABBED && !is_fullscreen);
 
   // Focus various bits of UI
   command_updater_.UpdateCommandEnabled(IDC_FOCUS_TOOLBAR, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_FOCUS_LOCATION, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_FOCUS_SEARCH, show_main_ui);
   command_updater_.UpdateCommandEnabled(
       IDC_FOCUS_MENU_BAR, main_not_fullscreen);
   command_updater_.UpdateCommandEnabled(
       IDC_FOCUS_NEXT_PANE, main_not_fullscreen);
   command_updater_.UpdateCommandEnabled(
@@ skipping 16 matching lines @@
   command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, options_enabled);
 
   command_updater_.UpdateCommandEnabled(IDC_EDIT_SEARCH_ENGINES, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_VIEW_PASSWORDS, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_ABOUT, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_SHOW_APP_MENU, show_main_ui);
 #if defined (ENABLE_PROFILING) && !defined(NO_TCMALLOC)
   command_updater_.UpdateCommandEnabled(IDC_PROFILING_ENABLED, show_main_ui);
 #endif
 
-  // Disable explicit fullscreen toggling when in metro snap mode.
-  command_updater_.UpdateCommandEnabled(
-      IDC_FULLSCREEN,
-      fullscreen_mode != FULLSCREEN_METRO_SNAP);
-
   UpdateCommandsForBookmarkBar();
   UpdateCommandsForMultipleProfiles();
 }
 
 void Browser::UpdateCommandsForMultipleProfiles() {
   bool show_main_ui = IsShowingMainUI(window_ && window_->IsFullscreen());
   command_updater_.UpdateCommandEnabled(IDC_SHOW_AVATAR_MENU,
       show_main_ui &&
       !profile()->IsOffTheRecord() &&
       ProfileManager::IsMultipleProfilesEnabled());
@@ skipping 799 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;
 }