Remove Animation When "Resuming" Window in Lion

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index ae0e665dcda73d2bf4059108334ce89eba2f62f1..848320899e2d9f0e02589693c0e5409dea692057 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -567,7 +567,7 @@ bool Browser::is_devtools() const {
 void Browser::OpenEmptyWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->AddBlankTab(true);
-  browser->window()->Show();
+  browser->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
 }
 
 // static
@@ -582,7 +582,7 @@ 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
@@ -658,7 +658,7 @@ TabContents* Browser::OpenApplicationWindow(
   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.
@@ -763,7 +763,7 @@ TabContents* Browser::OpenApplicationTab(Profile* profile,
 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)
@@ -771,49 +771,49 @@ void Browser::OpenBookmarkManagerWindow(Profile* profile) {
 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
 
@@ -821,7 +821,7 @@ void Browser::OpenInstantConfirmDialogWindow(Profile* profile) {
 void Browser::OpenExtensionsWindow(Profile* profile) {
   Browser* browser = Browser::Create(profile);
   browser->ShowExtensionsTab();
-  browser->window()->Show();
+  browser->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL);
 }
 
 // static
@@ -1323,7 +1323,7 @@ TabContents* Browser::GetOrCloneTabForDisposition(
       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:
@@ -1547,7 +1547,7 @@ void Browser::NewTab() {
   } 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.
@@ -1644,7 +1644,7 @@ void Browser::ConvertPopupToTabbedBrowser() {
       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() {
@@ -2963,7 +2963,7 @@ void Browser::DuplicateContentsAt(int index) {
 
     // 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);
@@ -3512,7 +3512,7 @@ void Browser::ConvertContentsToApplication(TabContents* contents) {
 
   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,
@@ -5058,7 +5058,7 @@ void Browser::ViewSource(TabContentsWrapper* contents,
 
     // 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);