summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r--chrome/browser/chromeos/enrollment_dialog_view.cc9
-rw-r--r--chrome/browser/chromeos/extensions/file_handler_util.cc4
-rw-r--r--chrome/browser/chromeos/extensions/file_manager_util.cc8
-rw-r--r--chrome/browser/chromeos/extensions/wallpaper_manager_util.cc4
-rw-r--r--chrome/browser/chromeos/locale_change_guard.cc4
-rw-r--r--chrome/browser/chromeos/network_message_observer.cc4
-rw-r--r--chrome/browser/chromeos/options/network_config_view.cc5
-rw-r--r--chrome/browser/chromeos/status/network_menu.cc7
-rw-r--r--chrome/browser/chromeos/system/ash_system_tray_delegate.cc4
9 files changed, 37 insertions, 12 deletions
diff --git a/chrome/browser/chromeos/enrollment_dialog_view.cc b/chrome/browser/chromeos/enrollment_dialog_view.cc
index ea41927..7b15796 100644
--- a/chrome/browser/chromeos/enrollment_dialog_view.cc
+++ b/chrome/browser/chromeos/enrollment_dialog_view.cc
@@ -11,6 +11,7 @@
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/browser/ui/host_desktop.h"
#include "chrome/common/url_constants.h"
#include "content/public/common/page_transition_types.h"
#include "grit/generated_resources.h"
@@ -110,10 +111,14 @@ int EnrollmentDialogView::GetDialogButtons() const {
bool EnrollmentDialogView::Accept() {
// TODO(beng): use Navigate().
// Navigate to the target URI in a browser tab.
- Browser* browser = browser::FindTabbedBrowser(profile_, false);
+ Browser* browser = browser::FindTabbedBrowser(profile_, false,
+ chrome::HOST_DESKTOP_TYPE_ASH);
if (!browser) {
// Couldn't find a tabbed browser: create one.
- browser = new Browser(Browser::CreateParams(profile_));
+ browser = new Browser(
+ Browser::CreateParams(Browser::TYPE_TABBED,
+ profile_,
+ chrome::HOST_DESKTOP_TYPE_ASH));
}
DCHECK(browser);
chrome::AddSelectedTabWithURL(browser, target_uri_,
diff --git a/chrome/browser/chromeos/extensions/file_handler_util.cc b/chrome/browser/chromeos/extensions/file_handler_util.cc
index 18058dc..7a505c6 100644
--- a/chrome/browser/chromeos/extensions/file_handler_util.cc
+++ b/chrome/browser/chromeos/extensions/file_handler_util.cc
@@ -27,6 +27,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/browser/ui/host_desktop.h"
#include "chrome/common/extensions/file_browser_handler.h"
#include "chrome/common/pref_names.h"
#include "content/public/browser/browser_thread.h"
@@ -603,7 +604,8 @@ bool FileTaskExecutor::Execute(const std::vector<GURL>& file_urls) {
Browser* FileTaskExecutor::GetBrowser() const {
return browser::FindOrCreateTabbedBrowser(
- profile_ ? profile_ : ProfileManager::GetDefaultProfileOrOffTheRecord());
+ profile_ ? profile_ : ProfileManager::GetDefaultProfileOrOffTheRecord(),
+ chrome::HOST_DESKTOP_TYPE_ASH);
}
const Extension* FileTaskExecutor::GetExtension() {
diff --git a/chrome/browser/chromeos/extensions/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager_util.cc
index 0355a45..d444856 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(
diff --git a/chrome/browser/chromeos/extensions/wallpaper_manager_util.cc b/chrome/browser/chromeos/extensions/wallpaper_manager_util.cc
index b639b17..01b92b0 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_manager_util.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_manager_util.cc
@@ -14,6 +14,7 @@
#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/chrome_pages.h"
+#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/chrome_switches.h"
@@ -82,7 +83,8 @@ void OpenWallpaperManager() {
browser->window()->Show();
} else {
Browser* browser = browser::FindOrCreateTabbedBrowser(
- ProfileManager::GetDefaultProfileOrOffTheRecord());
+ ProfileManager::GetDefaultProfileOrOffTheRecord(),
+ chrome::HOST_DESKTOP_TYPE_ASH);
chrome::ShowSettingsSubPage(browser, "setWallpaper");
}
}
diff --git a/chrome/browser/chromeos/locale_change_guard.cc b/chrome/browser/chromeos/locale_change_guard.cc
index b0d4856..7c4dc78 100644
--- a/chrome/browser/chromeos/locale_change_guard.cc
+++ b/chrome/browser/chromeos/locale_change_guard.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/host_desktop.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/pref_names.h"
#include "content/public/browser/notification_service.h"
@@ -82,7 +83,8 @@ void LocaleChangeGuard::RevertLocaleChange() {
profile_->ChangeAppLocale(
from_locale_, Profile::APP_LOCALE_CHANGED_VIA_REVERT);
- Browser* browser = browser::FindTabbedBrowser(profile_, false);
+ Browser* browser = browser::FindTabbedBrowser(profile_, false,
+ chrome::HOST_DESKTOP_TYPE_ASH);
if (browser)
chrome::ExecuteCommand(browser, IDC_EXIT);
}
diff --git a/chrome/browser/chromeos/network_message_observer.cc b/chrome/browser/chromeos/network_message_observer.cc
index fce775b..c63cf39 100644
--- a/chrome/browser/chromeos/network_message_observer.cc
+++ b/chrome/browser/chromeos/network_message_observer.cc
@@ -21,6 +21,7 @@
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/singleton_tabs.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/time_format.h"
@@ -153,7 +154,8 @@ void NetworkMessageObserver::OpenMobileSetupPage(
void NetworkMessageObserver::OpenMoreInfoPage(const ListValue* args) {
Browser* browser = browser::FindOrCreateTabbedBrowser(
- ProfileManager::GetDefaultProfileOrOffTheRecord());
+ ProfileManager::GetDefaultProfileOrOffTheRecord(),
+ chrome::HOST_DESKTOP_TYPE_ASH);
chromeos::NetworkLibrary* lib =
chromeos::CrosLibrary::Get()->GetNetworkLibrary();
const chromeos::CellularNetwork* cellular = lib->cellular_network();
diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc
index 5a9a576..a7d368a 100644
--- a/chrome/browser/chromeos/options/network_config_view.cc
+++ b/chrome/browser/chromeos/options/network_config_view.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/host_desktop.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
@@ -38,7 +39,9 @@ gfx::NativeWindow GetDialogParent() {
return chromeos::BaseLoginDisplayHost::default_host()->GetNativeWindow();
} else {
Browser* browser = browser::FindTabbedBrowser(
- ProfileManager::GetDefaultProfileOrOffTheRecord(), true);
+ ProfileManager::GetDefaultProfileOrOffTheRecord(),
+ true,
+ chrome::HOST_DESKTOP_TYPE_ASH);
if (browser)
return browser->window()->GetNativeWindow();
}
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index 2fde2c7..eeaac09 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -26,6 +26,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/chrome_pages.h"
+#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/singleton_tabs.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
@@ -82,7 +83,8 @@ bool ShouldHighlightNetwork(const chromeos::Network* network) {
Browser* GetAppropriateBrowser() {
DCHECK(chromeos::UserManager::Get()->IsSessionStarted());
return browser::FindOrCreateTabbedBrowser(
- ProfileManager::GetDefaultProfileOrOffTheRecord());
+ ProfileManager::GetDefaultProfileOrOffTheRecord(),
+ chrome::HOST_DESKTOP_TYPE_ASH);
}
} // namespace
@@ -440,7 +442,8 @@ void NetworkMenuModel::ActivatedAt(int index) {
cros->DisconnectFromNetwork(active_vpn);
} else if (flags & FLAG_VIEW_ACCOUNT) {
Browser* browser = browser::FindOrCreateTabbedBrowser(
- ProfileManager::GetDefaultProfileOrOffTheRecord());
+ ProfileManager::GetDefaultProfileOrOffTheRecord(),
+ chrome::HOST_DESKTOP_TYPE_ASH);
chrome::ShowSingletonTab(browser, GURL(top_up_url_));
}
}
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index 42e58ee..8bf40b3 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -61,6 +61,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/chrome_pages.h"
+#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/singleton_tabs.h"
#include "chrome/browser/upgrade_detector.h"
#include "chrome/common/chrome_notification_types.h"
@@ -703,7 +704,8 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
// browser window with an empty tab and returns it.
Browser* GetAppropriateBrowser() {
return browser::FindOrCreateTabbedBrowser(
- ProfileManager::GetDefaultProfileOrOffTheRecord());
+ ProfileManager::GetDefaultProfileOrOffTheRecord(),
+ chrome::HOST_DESKTOP_TYPE_ASH);
}
void SetProfile(Profile* profile) {
generated by cgit v1.1 at 2025-05-24 23:08:13 +0000