Remove Animation When "Resuming" Window in Lion

chrome/browser/ui/browser.cc

 // Copyright (c) 2011 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 549 matching lines @@
   return app_name_ == DevToolsWindow::kDevToolsApp;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, Creation Helpers:
 
 // static
 void Browser::OpenEmptyWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->AddBlankTab(true);
-  browser->window()->Show();
+  browser->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
 }
 
 // static
 void Browser::OpenWindowWithRestoredTabs(Profile* profile) {
   TabRestoreService* service = TabRestoreServiceFactory::GetForProfile(profile);
   if (service)
     service->RestoreMostRecentEntry(NULL);
 }
 
 // static
 void Browser::OpenURLOffTheRecord(Profile* profile, const GURL& url) {
   Browser* browser = GetOrCreateTabbedBrowser(
       profile->GetOffTheRecordProfile());
   browser->AddSelectedTabWithURL(url, PageTransition::LINK);
-  browser->window()->Show();
+  browser->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
 }
 
 // static
 TabContents* Browser::OpenApplication(
     Profile* profile,
     const Extension* extension,
     extension_misc::LaunchContainer container,
     WindowOpenDisposition disposition) {
   TabContents* tab = NULL;
   ExtensionPrefs* prefs = profile->GetExtensionService()->extension_prefs();
@@ skipping 55 matching lines @@
                                            profile);
 
   if (app_browser)
     *app_browser = browser;
 
   TabContentsWrapper* wrapper =
       browser->AddSelectedTabWithURL(url, PageTransition::START_PAGE);
   TabContents* contents = wrapper->tab_contents();
   contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
   contents->render_view_host()->SyncRendererPrefs();
-  browser->window()->Show();
+  browser->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
 
   // TODO(jcampan): http://crbug.com/8123 we should not need to set the initial
   //                focus explicitly.
   contents->view()->SetInitialFocus();
   return contents;
 }
 
 TabContents* Browser::OpenAppShortcutWindow(Profile* profile,
                                             const GURL& url,
                                             bool update_shortcut) {
@@ skipping 84 matching lines @@
       !browser->window()->IsFullscreen())
     browser->ToggleFullscreenMode();
 
   return contents;
 }
 
 // static
 void Browser::OpenBookmarkManagerWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->OpenBookmarkManager();
-  browser->window()->Show();
+  browser->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
 }
 
 #if defined(OS_MACOSX)
 // static
 void Browser::OpenHistoryWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->ShowHistoryTab();
-  browser->window()->Show();
+  browser->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
 }
 
 // static
 void Browser::OpenDownloadsWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->ShowDownloadsTab();
-  browser->window()->Show();
+  browser->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
 }
 
 // static
 void Browser::OpenHelpWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->ShowHelpTab();
-  browser->window()->Show();
+  browser->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
 }
 
 // static
 void Browser::OpenOptionsWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->OpenOptionsDialog();
-  browser->window()->Show();
+  browser->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
 }
 
 // static
 void Browser::OpenClearBrowsingDataDialogWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->OpenClearBrowsingDataDialog();
-  browser->window()->Show();
+  browser->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
 }
 
 // static
 void Browser::OpenImportSettingsDialogWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->OpenImportSettingsDialog();
-  browser->window()->Show();
+  browser->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
 }
 
 // static
 void Browser::OpenInstantConfirmDialogWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->OpenInstantConfirmDialog();
-  browser->window()->Show();
+  browser->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
 }
 #endif
 
 // static
 void Browser::OpenExtensionsWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->ShowExtensionsTab();
-  browser->window()->Show();
+  browser->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
 }
 
 // static
 void Browser::NewWindowWithProfile(Profile* profile) {
   UserMetrics::RecordAction(UserMetricsAction("NewWindow"));
   SessionService* session_service =
       SessionServiceFactory::GetForProfile(profile->GetOriginalProfile());
   if (!session_service ||
       !session_service->RestoreIfNecessary(std::vector<GURL>())) {
     Browser::OpenEmptyWindow(profile->GetOriginalProfile());
@@ skipping 481 matching lines @@
           current_tab, -1, PageTransition::LINK,
           disposition == NEW_FOREGROUND_TAB ? TabStripModel::ADD_ACTIVE :
                                               TabStripModel::ADD_NONE);
       break;
     }
     case NEW_WINDOW: {
       current_tab = current_tab->Clone();
       Browser* browser = Browser::Create(profile_);
       browser->tabstrip_model()->AddTabContents(
           current_tab, -1, PageTransition::LINK, TabStripModel::ADD_ACTIVE);
-      browser->window()->Show();
+      browser->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
       break;
     }
     default:
       break;
   }
   return current_tab->tab_contents();
 }
 
 void Browser::UpdateTabStripModelInsertionPolicy() {
   tab_handler_->GetTabStripModel()->SetInsertionPolicy(UseVerticalTabs() ?
@@ skipping 203 matching lines @@
 
 void Browser::NewTab() {
   UserMetrics::RecordAction(UserMetricsAction("NewTab"));
 
   if (is_type_tabbed()) {
     AddBlankTab(true);
     GetSelectedTabContentsWrapper()->view()->RestoreFocus();
   } else {
     Browser* b = GetOrCreateTabbedBrowser(profile_);
     b->AddBlankTab(true);
-    b->window()->Show();
+    b->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
     // The call to AddBlankTab above did not set the focus to the tab as its
     // window was not active, so we have to do it explicitly.
     // See http://crbug.com/6380.
     b->GetSelectedTabContentsWrapper()->view()->RestoreFocus();
   }
 }
 
 void Browser::CloseTab() {
   UserMetrics::RecordAction(UserMetricsAction("CloseTab_Accelerator"));
   if (CanCloseTab())
@@ skipping 76 matching lines @@
       g_browser_process->clipboard());
 }
 
 void Browser::ConvertPopupToTabbedBrowser() {
   UserMetrics::RecordAction(UserMetricsAction("ShowAsTab"));
   int tab_strip_index = tab_handler_->GetTabStripModel()->active_index();
   TabContentsWrapper* contents =
       tab_handler_->GetTabStripModel()->DetachTabContentsAt(tab_strip_index);
   Browser* browser = Browser::Create(profile_);
   browser->tabstrip_model()->AppendTabContents(contents, true);
-  browser->window()->Show();
+  browser->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
 }
 
 void Browser::ToggleFullscreenMode() {
   bool entering_fullscreen = !window_->IsFullscreen();
 
 #if !defined(OS_MACOSX)
   // In kiosk mode, we always want to be fullscreen. When the browser first
   // starts we're not yet fullscreen, so let the initial toggle go through.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode) &&
       window_->IsFullscreen())
@@ skipping 1298 matching lines @@
     }
 
     // Preserve the size of the original window. The new window has already
     // been given an offset by the OS, so we shouldn't copy the old bounds.
     BrowserWindow* new_window = browser->window();
     new_window->SetBounds(gfx::Rect(new_window->GetRestoredBounds().origin(),
                           window()->GetRestoredBounds().size()));
 
     // We need to show the browser now.  Otherwise ContainerWin assumes the
     // TabContents is invisible and won't size it.
-    browser->window()->Show();
+    browser->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
 
     // The page transition below is only for the purpose of inserting the tab.
     browser->AddTab(contents_dupe, PageTransition::LINK);
   }
 
   SessionService* session_service =
       SessionServiceFactory::GetForProfileIfExisting(profile_);
   if (session_service)
     session_service->TabRestored(contents_dupe, pinned);
 }
@@ skipping 528 matching lines @@
   Browser* app_browser = Browser::CreateForApp(
       TYPE_POPUP, app_name, gfx::Rect(), profile_);
   TabContentsWrapper* wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(contents);
   if (!wrapper)
     wrapper = new TabContentsWrapper(contents);
   app_browser->tabstrip_model()->AppendTabContents(wrapper, true);
 
   contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
   contents->render_view_host()->SyncRendererPrefs();
-  app_browser->window()->Show();
+  app_browser->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
 }
 
 void Browser::BeforeUnloadFired(TabContents* tab,
                                 bool proceed,
                                 bool* proceed_to_fire_unload) {
   if (!is_attempting_to_close_browser_) {
     *proceed_to_fire_unload = proceed;
     if (!proceed)
       tab->set_closed_by_user_gesture(false);
     return;
@@ skipping 1525 matching lines @@
     Browser* browser = Browser::CreateForType(TYPE_TABBED, profile_);
 
     // Preserve the size of the original window. The new window has already
     // been given an offset by the OS, so we shouldn't copy the old bounds.
     BrowserWindow* new_window = browser->window();
     new_window->SetBounds(gfx::Rect(new_window->GetRestoredBounds().origin(),
                           window()->GetRestoredBounds().size()));
 
     // We need to show the browser now. Otherwise ContainerWin assumes the
     // TabContents is invisible and won't size it.
-    browser->window()->Show();
+    browser->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
 
     // The page transition below is only for the purpose of inserting the tab.
     browser->AddTab(view_source_contents, PageTransition::LINK);
   }
 
   SessionService* session_service =
       SessionServiceFactory::GetForProfileIfExisting(profile_);
   if (session_service)
     session_service->TabRestored(view_source_contents, false);
 }
@@ skipping 48 matching lines @@
 }
 
 void Browser::ShowSyncSetup() {
   ProfileSyncService* service =
       profile()->GetOriginalProfile()->GetProfileSyncService();
   if (service->HasSyncSetupCompleted())
     ShowOptionsTab(chrome::kSyncSetupSubPage);
   else
     service->ShowLoginDialog();
 }