Index: chrome/browser/ui/browser_commands.cc |
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc |
index 4b43f9887bf4facded5635ba2f30bc135d5d9379..543f8882b5e647665c57b1fc131d7fdde43aec53 100644 |
--- a/chrome/browser/ui/browser_commands.cc |
+++ b/chrome/browser/ui/browser_commands.cc |
@@ -320,7 +320,7 @@ int GetContentRestrictions(const Browser* browser) { |
return content_restrictions; |
} |
-void NewEmptyWindow(Profile* profile, HostDesktopType desktop_type) { |
+void NewEmptyWindow(Profile* profile, ui::HostDesktopType desktop_type) { |
bool incognito = profile->IsOffTheRecord(); |
PrefService* prefs = profile->GetPrefs(); |
if (incognito) { |
@@ -350,7 +350,7 @@ void NewEmptyWindow(Profile* profile, HostDesktopType desktop_type) { |
} |
} |
-Browser* OpenEmptyWindow(Profile* profile, HostDesktopType desktop_type) { |
+Browser* OpenEmptyWindow(Profile* profile, ui::HostDesktopType desktop_type) { |
Browser* browser = new Browser( |
Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type)); |
AddTabAt(browser, GURL(), -1, true); |
@@ -359,7 +359,7 @@ Browser* OpenEmptyWindow(Profile* profile, HostDesktopType desktop_type) { |
} |
void OpenWindowWithRestoredTabs(Profile* profile, |
- HostDesktopType host_desktop_type) { |
+ ui::HostDesktopType host_desktop_type) { |
TabRestoreService* service = TabRestoreServiceFactory::GetForProfile(profile); |
if (service) |
service->RestoreMostRecentEntry(NULL, host_desktop_type); |
@@ -367,7 +367,7 @@ void OpenWindowWithRestoredTabs(Profile* profile, |
void OpenURLOffTheRecord(Profile* profile, |
const GURL& url, |
- chrome::HostDesktopType desktop_type) { |
+ ui::HostDesktopType desktop_type) { |
ScopedTabbedBrowserDisplayer displayer(profile->GetOffTheRecordProfile(), |
desktop_type); |
AddSelectedTabWithURL(displayer.browser(), url, |
@@ -901,7 +901,7 @@ bool CanBasicPrint(Browser* browser) { |
// is under Win8 ash, since showing the advanced print dialog will open it |
// modally on the Desktop and hang the browser. |
#if defined(OS_WIN) |
- if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) |
+ if (chrome::GetActiveDesktop() == ui::HOST_DESKTOP_TYPE_ASH) |
return false; |
#endif |