| Index: chrome/browser/chromeos/extensions/file_manager_util.cc
|
| diff --git a/chrome/browser/chromeos/extensions/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager_util.cc
|
| index 0355a45f87e834cad5334d4bcaf508bf34208474..d44485658265e277edbc3a4d14d421e5702cd7dc 100644
|
| --- a/chrome/browser/chromeos/extensions/file_manager_util.cc
|
| +++ b/chrome/browser/chromeos/extensions/file_manager_util.cc
|
| @@ -32,6 +32,7 @@
|
| #include "chrome/browser/ui/browser_tabstrip.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| #include "chrome/browser/ui/extensions/application_launch.h"
|
| +#include "chrome/browser/ui/host_desktop.h"
|
| #include "chrome/browser/ui/simple_message_box.h"
|
| #include "chrome/browser/ui/tab_contents/tab_contents.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| @@ -206,7 +207,8 @@ DictionaryValue* ProgessStatusToDictionaryValue(
|
| void OpenNewTab(const GURL& url, Profile* profile) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| Browser* browser = browser::FindOrCreateTabbedBrowser(
|
| - profile ? profile : ProfileManager::GetDefaultProfileOrOffTheRecord());
|
| + profile ? profile : ProfileManager::GetDefaultProfileOrOffTheRecord(),
|
| + chrome::HOST_DESKTOP_TYPE_ASH);
|
| chrome::AddSelectedTabWithURL(browser, 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.
|
| @@ -217,7 +219,9 @@ void OpenNewTab(const GURL& url, Profile* profile) {
|
| void ShowWarningMessageBox(Profile* profile, const FilePath& path) {
|
| // TODO: if FindOrCreateTabbedBrowser creates a new browser the returned
|
| // browser is leaked.
|
| - Browser* browser = browser::FindOrCreateTabbedBrowser(profile);
|
| + Browser* browser =
|
| + browser::FindOrCreateTabbedBrowser(profile,
|
| + chrome::HOST_DESKTOP_TYPE_ASH);
|
| chrome::ShowMessageBox(
|
| browser->window()->GetNativeWindow(),
|
| l10n_util::GetStringFUTF16(
|
|
|