chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc - Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.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

« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc » ('j') | ui/gfx/host_desktop_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

index 2d7d934e03d7710b0b169a09511b51d0f942ad26..26a30552aa57abfe7cde21973f3fc4799c0afc9d 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

@@ -936,7 +936,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, LaunchMaximized) {

content::WindowedNotificationObserver open_observer(

chrome::NOTIFICATION_BROWSER_WINDOW_READY,

content::NotificationService::AllSources());

- chrome::NewEmptyWindow(browser()->profile(), chrome::HOST_DESKTOP_TYPE_ASH);

+ chrome::NewEmptyWindow(browser()->profile(), ui::HOST_DESKTOP_TYPE_ASH);

open_observer.Wait();

Browser* browser2 = content::Source<Browser>(open_observer.source()).ptr();

aura::Window* window2 = browser2->window()->GetNativeWindow();

@@ -1630,7 +1630,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, ActivateAfterSessionRestore) {

browser());

// Check that the LRU browser list does only contain the original browser.

BrowserList* ash_browser_list =

- BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);

+ BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH);

BrowserList::const_reverse_iterator it =

ash_browser_list->begin_last_active();

EXPECT_EQ(*it, browser());

@@ -2139,7 +2139,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, V1AppNavigation) {

// Create a windowed application.

AppLaunchParams params(

profile(), controller_->GetExtensionForAppID(extensions::kWebStoreAppId),

- CURRENT_TAB, chrome::HOST_DESKTOP_TYPE_ASH, extensions::SOURCE_TEST);

+ CURRENT_TAB, ui::HOST_DESKTOP_TYPE_ASH, extensions::SOURCE_TEST);

params.container = extensions::LAUNCH_CONTAINER_WINDOW;

OpenApplication(params);

EXPECT_EQ(ash::STATUS_ACTIVE, model_->ItemByID(id)->status);

@@ -2147,7 +2147,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, V1AppNavigation) {

// Find the browser which holds our app.

Browser* app_browser = NULL;

const BrowserList* ash_browser_list =

- BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);

+ BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH);

for (BrowserList::const_reverse_iterator it =

ash_browser_list->begin_last_active();

it != ash_browser_list->end_last_active() && !app_browser; ++it) {