| Index: chrome/browser/ui/chrome_pages.cc
|
| diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
|
| index 1af2861da6ca10ed273b8b991aeab9201c3d46ec..4dbbeb300ee22c77499cfaee08d3a08757e17069 100644
|
| --- a/chrome/browser/ui/chrome_pages.cc
|
| +++ b/chrome/browser/ui/chrome_pages.cc
|
| @@ -79,7 +79,7 @@ void NavigateToSingletonTab(Browser* browser, const GURL& url) {
|
| // is created.
|
| void ShowHelpImpl(Browser* browser,
|
| Profile* profile,
|
| - HostDesktopType host_desktop_type,
|
| + ui::HostDesktopType host_desktop_type,
|
| HelpSource source) {
|
| content::RecordAction(UserMetricsAction("ShowHelpTab"));
|
| #if defined(OS_CHROMEOS) && defined(OFFICIAL_BUILD)
|
| @@ -203,7 +203,7 @@ void ShowHelp(Browser* browser, HelpSource source) {
|
| }
|
|
|
| void ShowHelpForProfile(Profile* profile,
|
| - HostDesktopType host_desktop_type,
|
| + ui::HostDesktopType host_desktop_type,
|
| HelpSource source) {
|
| ShowHelpImpl(NULL, profile, host_desktop_type, source);
|
| }
|
| @@ -278,10 +278,10 @@ void ShowSettingsSubPageForProfile(Profile* profile,
|
| return;
|
| }
|
| Browser* browser =
|
| - chrome::FindTabbedBrowser(profile, false, HOST_DESKTOP_TYPE_NATIVE);
|
| + chrome::FindTabbedBrowser(profile, false, ui::HOST_DESKTOP_TYPE_NATIVE);
|
| if (!browser) {
|
| browser = new Browser(
|
| - Browser::CreateParams(profile, chrome::HOST_DESKTOP_TYPE_NATIVE));
|
| + Browser::CreateParams(profile, ui::HOST_DESKTOP_TYPE_NATIVE));
|
| }
|
| ShowSettingsSubPageInTabbedBrowser(browser, sub_page);
|
| }
|
| @@ -360,7 +360,7 @@ void ShowBrowserSignin(Browser* browser, signin_metrics::Source source) {
|
| if (browser->profile()->IsOffTheRecord()) {
|
| switched_browser = true;
|
| displayer.reset(new ScopedTabbedBrowserDisplayer(
|
| - original_profile, chrome::HOST_DESKTOP_TYPE_NATIVE));
|
| + original_profile, ui::HOST_DESKTOP_TYPE_NATIVE));
|
| browser = displayer->browser();
|
| }
|
|
|
|
|