[File Manager] Make sure the new tab is always visible when opening files.

chrome/browser/chromeos/extensions/file_manager_util.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/chromeos/extensions/file_manager_util.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 197 matching lines @@
   result->SetString("transferState",
       GDataOperationRegistry::OperationTransferStateToString(
           status.transfer_state));
   result->SetString("transferType",
       GDataOperationRegistry::OperationTypeToString(status.operation_type));
   result->SetInteger("processed", static_cast<int>(status.progress_current));
   result->SetInteger("total", static_cast<int>(status.progress_total));
   return result.release();
 }
 
+void OpenNewTab(const GURL& url, Profile* profile) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  Browser* browser = Browser::GetOrCreateTabbedBrowser(
+      profile ? profile : ProfileManager::GetDefaultProfileOrOffTheRecord());
+  browser->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_LINK);
+  // If the current browser is not tabbed then the new tab will be created
+  // in a different browser. Make sure it is visible.
+  browser->window()->Show();
+}
+
 // Shows a warning message box saying that the file could not be opened.
 void ShowWarningMessageBox(Profile* profile, const FilePath& path) {
   Browser* browser = Browser::GetOrCreateTabbedBrowser(profile);
   browser::ShowWarningMessageBox(
       browser->window()->GetNativeHandle(),
       l10n_util::GetStringFUTF16(
           IDS_FILE_BROWSER_ERROR_VIEWING_FILE_TITLE,
           UTF8ToUTF16(path.BaseName().value())),
       l10n_util::GetStringUTF16(IDS_FILE_BROWSER_ERROR_VIEWING_FILE));
 }
@@ skipping 12 matching lines @@
     gdata::GDataFile* file = entry->AsGDataFile();
     GURL page_url;
     if (file_type == gdata::REGULAR_FILE) {
       page_url = gdata::util::GetFileResourceUrl(file->resource_id(),
                                                  file->file_name());
     } else if (file_type == gdata::HOSTED_DOCUMENT) {
       page_url = file->alternate_url();
     } else {
       NOTREACHED();
     }
-    Browser* browser = Browser::GetOrCreateTabbedBrowser(profile);
-    browser->AddSelectedTabWithURL(page_url, content::PAGE_TRANSITION_LINK);
+    OpenNewTab(page_url, profile);
   } else {
     ShowWarningMessageBox(profile, file_path);
   }
 }
 
 }  // namespace
 
 GURL GetFileBrowserExtensionUrl() {
   return GURL(kFileBrowserExtensionUrl);
 }
@@ skipping 298 matching lines @@
   char buf[1 << 12];  // 4K
   size_t len = fread(buf, 1, sizeof(buf), file);
   if (len > 0) {
     contents->append(buf, len);
   }
   file_util::CloseFile(file);
 
   return len < sizeof(buf);
 }
 
-void OpenUrlOnUIThread(const GURL& url) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  Browser* browser = Browser::GetOrCreateTabbedBrowser(
-      ProfileManager::GetDefaultProfileOrOffTheRecord());
-  browser->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_LINK);
-}
-
 // Reads JSON from a Google Docs file, extracts a document url and opens it
 // in a tab.
 void ReadUrlFromGDocOnFileThread(const FilePath& file_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   std::string contents;
   if (!ReadSmallFileToString(file_path, &contents)) {
     LOG(ERROR) << "Error reading " << file_path.value();
     return;
   }
 
   scoped_ptr<base::Value> root_value;
   root_value.reset(base::JSONReader::Read(contents));
 
   DictionaryValue* dictionary_value;
   std::string edit_url_string;
   if (!root_value.get() ||
       !root_value->GetAsDictionary(&dictionary_value) ||
       !dictionary_value->GetString("url", &edit_url_string)) {
     LOG(ERROR) << "Invalid JSON in " << file_path.value();
     return;
   }
 
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-      base::Bind(OpenUrlOnUIThread, GURL(edit_url_string)));
+      base::Bind(OpenNewTab, GURL(edit_url_string), (Profile*)NULL));
 }
 
 bool TryViewingFile(Profile* profile, const FilePath& path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  Browser* browser = Browser::GetOrCreateTabbedBrowser(profile);
-
   std::string file_extension = path.Extension();
   // For things supported natively by the browser, we should open it
   // in a tab.
   if (IsSupportedBrowserExtension(file_extension.data()) ||
       ShouldBeOpenedWithPdfPlugin(profile, file_extension.data())) {
     GURL page_url = net::FilePathToFileURL(path);
 #if defined(OS_CHROMEOS)
     // Override gdata resource to point to internal handler instead of file:
     // URL.
     if (gdata::util::GetSpecialRemoteRootPath().IsParent(path)) {
       gdata::GDataSystemService* system_service =
           gdata::GDataSystemServiceFactory::GetForProfile(profile);
       if (!system_service)
         return false;
 
       // Open the file once the file is found.
       system_service->file_system()->FindEntryByPathAsync(
           gdata::util::ExtractGDataPath(path),
           base::Bind(&OnGDataFileFound, profile, path, gdata::REGULAR_FILE));
       return true;
     }
 #endif
-    browser->AddSelectedTabWithURL(page_url,
-                                   content::PAGE_TRANSITION_LINK);
+    OpenNewTab(page_url, (Profile*)NULL);
     return true;
   }
 
   if (IsSupportedGDocsExtension(file_extension.data())) {
     if (gdata::util::GetSpecialRemoteRootPath().IsParent(path)) {
       // The file is on Google Docs. Get the Docs from the GData service.
       gdata::GDataSystemService* system_service =
           gdata::GDataSystemServiceFactory::GetForProfile(profile);
       if (!system_service)
         return false;
@@ skipping 79 matching lines @@
           GDataOperationRegistry::ProgressStatus>::const_iterator iter =
               list.begin();
        iter != list.end(); ++iter) {
     result_list->Append(
         ProgessStatusToDictionaryValue(profile, origin_url, *iter));
   }
   return result_list.release();
 }
 
 }  // namespace file_manager_util