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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/window_sizer/window_sizer_ash_unittest.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/window_sizer/window_sizer_ash_uitest.cc ('k') | chrome/browser/ui/window_sizer/window_sizer_aura.cc » ('j') | ui/gfx/host_desktop_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
index a05b2bf4bacd0783b426ec45a0707d1e6def3b51..49ad974f5aefdc7c1e529b21ed6b6a3b7d3c5607 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
@@ -428,28 +428,27 @@ TEST_F(WindowSizerAshTest, MAYBE_PlaceNewWindows) {
scoped_ptr<TestingProfile> profile(new TestingProfile());
// Creating a popup handler here to make sure it does not interfere with the
// existing windows.
- Browser::CreateParams native_params(profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams native_params(profile.get(), ui::HOST_DESKTOP_TYPE_ASH);
scoped_ptr<Browser> browser(
chrome::CreateBrowserWithTestWindowForParams(&native_params));
// Creating a popup handler here to make sure it does not interfere with the
// existing windows.
- Browser::CreateParams params2(profile.get(), chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams params2(profile.get(), ui::HOST_DESKTOP_TYPE_ASH);
scoped_ptr<Browser> browser2(CreateTestBrowser(
CreateTestWindowInShellWithId(0), gfx::Rect(16, 32, 640, 320), &params2));
BrowserWindow* browser_window = browser2->window();
// Creating a popup to make sure it does not interfere with the positioning.
Browser::CreateParams params_popup(Browser::TYPE_POPUP, profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ ui::HOST_DESKTOP_TYPE_ASH);
scoped_ptr<Browser> browser_popup(
CreateTestBrowser(CreateTestWindowInShellWithId(1),
gfx::Rect(16, 32, 128, 256), &params_popup));
// Creating a panel to make sure it does not interfere with the positioning.
Browser::CreateParams params_panel(Browser::TYPE_POPUP, profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ ui::HOST_DESKTOP_TYPE_ASH);
scoped_ptr<Browser> browser_panel(
CreateTestBrowser(CreateTestWindowInShellWithId(2),
gfx::Rect(32, 48, 256, 512), &params_panel));
@@ -505,8 +504,7 @@ TEST_F(WindowSizerAshTest, MAYBE_PlaceNewWindows) {
TEST_F(WindowSizerAshTest, MAYBE_PlaceNewBrowserWindowOnEmptyDesktop) {
// Create a browser to pass into the GetWindowBoundsAndShowState function.
scoped_ptr<TestingProfile> profile(new TestingProfile());
- Browser::CreateParams native_params(profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams native_params(profile.get(), ui::HOST_DESKTOP_TYPE_ASH);
scoped_ptr<Browser> browser(
chrome::CreateBrowserWithTestWindowForParams(&native_params));
@@ -593,7 +591,7 @@ TEST_F(WindowSizerAshTest, MAYBE_PlaceNewWindowsOnMultipleDisplays) {
scoped_ptr<TestingProfile> profile(new TestingProfile());
// Create browser windows that are used as reference.
- Browser::CreateParams params(profile.get(), chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams params(profile.get(), ui::HOST_DESKTOP_TYPE_ASH);
scoped_ptr<Browser> browser(CreateTestBrowser(
CreateTestWindowInShellWithId(0), gfx::Rect(10, 10, 200, 200), &params));
BrowserWindow* browser_window = browser->window();
@@ -602,7 +600,7 @@ TEST_F(WindowSizerAshTest, MAYBE_PlaceNewWindowsOnMultipleDisplays) {
EXPECT_EQ(native_window->GetRootWindow(), ash::Shell::GetTargetRootWindow());
Browser::CreateParams another_params(profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ ui::HOST_DESKTOP_TYPE_ASH);
scoped_ptr<Browser> another_browser(
CreateTestBrowser(CreateTestWindowInShellWithId(1),
gfx::Rect(400, 10, 300, 300), &another_params));
@@ -612,8 +610,7 @@ TEST_F(WindowSizerAshTest, MAYBE_PlaceNewWindowsOnMultipleDisplays) {
another_browser_window->Show();
// Creating a new window to verify the new placement.
- Browser::CreateParams new_params(profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams new_params(profile.get(), ui::HOST_DESKTOP_TYPE_ASH);
scoped_ptr<Browser> new_browser(CreateTestBrowser(
CreateTestWindowInShellWithId(0), gfx::Rect(), &new_params));
@@ -688,13 +685,13 @@ TEST_F(WindowSizerAshTest, MAYBE_TestShowState) {
// Creating a browser & window to play with.
Browser::CreateParams params(Browser::TYPE_TABBED, profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ ui::HOST_DESKTOP_TYPE_ASH);
scoped_ptr<Browser> browser(CreateTestBrowser(
CreateTestWindowInShellWithId(0), gfx::Rect(16, 32, 640, 320), &params));
// Create also a popup browser since that behaves different.
Browser::CreateParams params_popup(Browser::TYPE_POPUP, profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ ui::HOST_DESKTOP_TYPE_ASH);
scoped_ptr<Browser> browser_popup(
CreateTestBrowser(CreateTestWindowInShellWithId(1),
gfx::Rect(16, 32, 640, 320), &params_popup));
@@ -727,7 +724,7 @@ TEST_F(WindowSizerAshTest, MAYBE_TestShowState) {
// window should follow the top level window's state.
// Creating a browser & window to play with.
Browser::CreateParams params2(Browser::TYPE_TABBED, profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ ui::HOST_DESKTOP_TYPE_ASH);
scoped_ptr<Browser> browser2(CreateTestBrowser(
CreateTestWindowInShellWithId(3), gfx::Rect(16, 32, 640, 320), &params2));
@@ -764,14 +761,14 @@ TEST_F(WindowSizerAshTest, TestShowStateDefaults) {
scoped_ptr<TestingProfile> profile(new TestingProfile());
Browser::CreateParams params(Browser::TYPE_TABBED, profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ ui::HOST_DESKTOP_TYPE_ASH);
scoped_ptr<Browser> browser(CreateTestBrowser(
CreateTestWindowInShellWithId(0), gfx::Rect(16, 32, 640, 320), &params));
// Create also a popup browser since that behaves slightly different for
// defaults.
Browser::CreateParams params_popup(Browser::TYPE_POPUP, profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ ui::HOST_DESKTOP_TYPE_ASH);
scoped_ptr<Browser> browser_popup(
CreateTestBrowser(CreateTestWindowInShellWithId(1),
gfx::Rect(16, 32, 128, 256), &params_popup));
@@ -822,8 +819,7 @@ TEST_F(WindowSizerAshTest, TestShowStateDefaults) {
TEST_F(WindowSizerAshTest, DefaultStateBecomesMaximized) {
// Create a browser to pass into the GetWindowBounds function.
scoped_ptr<TestingProfile> profile(new TestingProfile());
- Browser::CreateParams native_params(profile.get(),
- chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::CreateParams native_params(profile.get(), ui::HOST_DESKTOP_TYPE_ASH);
scoped_ptr<Browser> browser(
chrome::CreateBrowserWithTestWindowForParams(&native_params));
@@ -893,7 +889,7 @@ TEST_F(WindowSizerAshTest, DefaultBoundsInTargetDisplay) {
TEST_F(WindowSizerAshTest, TrustedPopupBehavior) {
scoped_ptr<TestingProfile> profile(new TestingProfile());
Browser::CreateParams trusted_popup_create_params(
- Browser::TYPE_POPUP, profile.get(), chrome::HOST_DESKTOP_TYPE_ASH);
+ Browser::TYPE_POPUP, profile.get(), ui::HOST_DESKTOP_TYPE_ASH);
trusted_popup_create_params.trusted_source = true;
scoped_ptr<Browser> trusted_popup(CreateTestBrowser(
« no previous file with comments | « chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc ('k') | chrome/browser/ui/window_sizer/window_sizer_aura.cc » ('j') | ui/gfx/host_desktop_type.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698