Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3616)

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
index 4f80cb60a506c6780fa60887492dba418ede9d5a..ea909326c313c997072d1d367cae9ce9a960cd9f 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -467,7 +467,7 @@ void SystemTrayDelegateChromeOS::ShowDisplaySettings() {
void SystemTrayDelegateChromeOS::ShowChromeSlow() {
chrome::ScopedTabbedBrowserDisplayer displayer(
- ProfileManager::GetPrimaryUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
+ ProfileManager::GetPrimaryUserProfile(), ui::HOST_DESKTOP_TYPE_ASH);
chrome::ShowSlow(displayer.browser());
}
@@ -476,7 +476,7 @@ bool SystemTrayDelegateChromeOS::ShouldShowDisplayNotification() {
// display settings is in background of a packaged app, it will return true.
// TODO(mukai): fix this.
Browser* active_browser =
- chrome::FindLastActiveWithHostDesktopType(chrome::HOST_DESKTOP_TYPE_ASH);
+ chrome::FindLastActiveWithHostDesktopType(ui::HOST_DESKTOP_TYPE_ASH);
if (!active_browser)
return true;
@@ -499,13 +499,13 @@ void SystemTrayDelegateChromeOS::ShowIMESettings() {
void SystemTrayDelegateChromeOS::ShowHelp() {
chrome::ShowHelpForProfile(ProfileManager::GetActiveUserProfile(),
- chrome::HOST_DESKTOP_TYPE_ASH,
+ ui::HOST_DESKTOP_TYPE_ASH,
chrome::HELP_SOURCE_MENU);
}
void SystemTrayDelegateChromeOS::ShowAccessibilityHelp() {
chrome::ScopedTabbedBrowserDisplayer displayer(
- ProfileManager::GetActiveUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
+ ProfileManager::GetActiveUserProfile(), ui::HOST_DESKTOP_TYPE_ASH);
accessibility::ShowAccessibilityHelp(displayer.browser());
}
@@ -519,7 +519,7 @@ void SystemTrayDelegateChromeOS::ShowAccessibilitySettings() {
void SystemTrayDelegateChromeOS::ShowPublicAccountInfo() {
chrome::ScopedTabbedBrowserDisplayer displayer(
- ProfileManager::GetActiveUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
+ ProfileManager::GetActiveUserProfile(), ui::HOST_DESKTOP_TYPE_ASH);
chrome::ShowPolicy(displayer.browser());
}
@@ -541,7 +541,7 @@ void SystemTrayDelegateChromeOS::ShowEnterpriseInfo() {
help_app->ShowHelpTopic(chromeos::HelpAppLauncher::HELP_ENTERPRISE);
} else {
chrome::ScopedTabbedBrowserDisplayer displayer(
- ProfileManager::GetActiveUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
+ ProfileManager::GetActiveUserProfile(), ui::HOST_DESKTOP_TYPE_ASH);
chrome::ShowSingletonTab(displayer.browser(),
GURL(chrome::kLearnMoreEnterpriseURL));
}
@@ -1037,7 +1037,7 @@ void SystemTrayDelegateChromeOS::NotifyIfLastWindowClosed() {
return;
BrowserList* browser_list =
- BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
+ BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH);
for (BrowserList::const_iterator it = browser_list->begin();
it != browser_list->end();
++it) {

Powered by Google App Engine
This is Rietveld 408576698