diff options
| author | mtomasz@chromium.org <mtomasz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-16 04:09:33 +0000 |
|---|---|---|
| committer | mtomasz@chromium.org <mtomasz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-16 04:09:33 +0000 |
| commit | e4af58c404d353a8ed03508c37cda56874221a0b (patch) | |
| tree | dbb3fb63a76a3d923341c74d93fc8fd1c163e672 /chrome/browser/chromeos | |
| parent | c36425827d9f9f89af190915fc74b47fea724643 (diff) | |
| download | chromium_src-e4af58c404d353a8ed03508c37cda56874221a0b.zip chromium_src-e4af58c404d353a8ed03508c37cda56874221a0b.tar.gz chromium_src-e4af58c404d353a8ed03508c37cda56874221a0b.tar.bz2 | |
Fix opening Google Doc's documents in Files.app V2.
Opening such files failed, when no browser window was running. This is because packaged apps are not running within a browser window, and therefore GetCurrentBrowser returns NULL, if there is no browser window running. Therefore we need to create a browser instance. This patch fixes this problem by replacing GetCurrentBrowser with a FindOrCreateTabbedBrowser call.
TEST=Run chrome with --file-manager-packaged, launch Files.app and try to open a .gdoc file.
BUG=231190
Review URL: https://codereview.chromium.org/13980006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194287 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
| -rw-r--r-- | chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc index 5ad9f6f..42f35f3 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc @@ -53,6 +53,7 @@ #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/views/select_file_dialog_extension.h" #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" @@ -1394,7 +1395,8 @@ bool ViewFilesFunction::RunImpl() { files.push_back(path); } - Browser* browser = GetCurrentBrowser(); + Browser* browser = chrome::FindOrCreateTabbedBrowser( + profile_, chrome::HOST_DESKTOP_TYPE_ASH); bool success = browser; if (browser) { diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc index 8e03644..e58f04b 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc @@ -841,7 +841,6 @@ void OpenFileBrowser() { bool ExecuteBuiltinHandler(Browser* browser, const base::FilePath& path, const std::string& internal_task_id) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); Profile* profile = browser->profile(); |