Rename WindowTreeHost G|SetBounds to indicate they are in pixels.

ash/display/display_manager_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/display/manager/display_manager.h"
 
 #include "ash/accelerators/accelerator_commands_aura.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/display/display_configuration_controller.h"
@@ skipping 852 matching lines @@
   // Connect another display which will become primary.
   const display::ManagedDisplayInfo external_display_info =
       CreateDisplayInfo(10, gfx::Rect(1, 1, 100, 100));
   display_info_list.push_back(external_display_info);
   display_manager()->OnNativeDisplaysChanged(display_info_list);
   EXPECT_EQ(1U, display_manager()->GetNumDisplays());
   EXPECT_EQ("1,1 100x100",
             GetDisplayInfoForId(10).bounds_in_native().ToString());
   EXPECT_EQ("100x100", ash::Shell::GetPrimaryRootWindow()
                            ->GetHost()
-                           ->GetBounds()
+                           ->GetBoundsInPixels()
                            .size()
                            .ToString());
 }
 #endif  // defined(OS_CHROMEOS)
 
 TEST_P(DisplayManagerTest, NativeDisplaysChangedAfterPrimaryChange) {
   if (!SupportsMultipleDisplays())
     return;
 
   const int64_t internal_display_id =
@@ skipping 753 matching lines @@
   display::Screen::GetScreen()->AddObserver(&display_observer);
 
   display_manager()->SetMultiDisplayMode(display::DisplayManager::MIRRORING);
   display_manager()->UpdateDisplays();
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(display_observer.changed_and_reset());
   EXPECT_EQ(1U, display_manager()->GetNumDisplays());
   EXPECT_EQ(
       "0,0 300x400",
       display::Screen::GetScreen()->GetPrimaryDisplay().bounds().ToString());
-  EXPECT_EQ("400x500", test_api.GetHost()->GetBounds().size().ToString());
+  EXPECT_EQ("400x500",
+            test_api.GetHost()->GetBoundsInPixels().size().ToString());
   EXPECT_EQ("300x400",
             test_api.GetHost()->window()->bounds().size().ToString());
   EXPECT_TRUE(display_manager()->IsInMirrorMode());
 
   display_manager()->SetMirrorMode(false);
   EXPECT_TRUE(display_observer.changed_and_reset());
   EXPECT_EQ(nullptr, test_api.GetHost());
   EXPECT_EQ(2U, display_manager()->GetNumDisplays());
   EXPECT_FALSE(display_manager()->IsInMirrorMode());
 
@@ skipping 231 matching lines @@
 #if defined(OS_CHROMEOS)
 TEST_P(DisplayManagerTest, UpdateDisplayWithHostOrigin) {
   UpdateDisplay("100x200,300x400");
   ASSERT_EQ(2, display::Screen::GetScreen()->GetNumDisplays());
   aura::Window::Windows root_windows =
       Shell::GetInstance()->GetAllRootWindows();
   ASSERT_EQ(2U, root_windows.size());
   aura::WindowTreeHost* host0 = root_windows[0]->GetHost();
   aura::WindowTreeHost* host1 = root_windows[1]->GetHost();
 
-  EXPECT_EQ("1,1", host0->GetBounds().origin().ToString());
-  EXPECT_EQ("100x200", host0->GetBounds().size().ToString());
+  EXPECT_EQ("1,1", host0->GetBoundsInPixels().origin().ToString());
+  EXPECT_EQ("100x200", host0->GetBoundsInPixels().size().ToString());
   // UpdateDisplay set the origin if it's not set.
-  EXPECT_NE("1,1", host1->GetBounds().origin().ToString());
-  EXPECT_EQ("300x400", host1->GetBounds().size().ToString());
+  EXPECT_NE("1,1", host1->GetBoundsInPixels().origin().ToString());
+  EXPECT_EQ("300x400", host1->GetBoundsInPixels().size().ToString());
 
   UpdateDisplay("100x200,200+300-300x400");
   ASSERT_EQ(2, display::Screen::GetScreen()->GetNumDisplays());
-  EXPECT_EQ("0,0", host0->GetBounds().origin().ToString());
-  EXPECT_EQ("100x200", host0->GetBounds().size().ToString());
-  EXPECT_EQ("200,300", host1->GetBounds().origin().ToString());
-  EXPECT_EQ("300x400", host1->GetBounds().size().ToString());
+  EXPECT_EQ("0,0", host0->GetBoundsInPixels().origin().ToString());
+  EXPECT_EQ("100x200", host0->GetBoundsInPixels().size().ToString());
+  EXPECT_EQ("200,300", host1->GetBoundsInPixels().origin().ToString());
+  EXPECT_EQ("300x400", host1->GetBoundsInPixels().size().ToString());
 
   UpdateDisplay("400+500-200x300,300x400");
   ASSERT_EQ(2, display::Screen::GetScreen()->GetNumDisplays());
-  EXPECT_EQ("400,500", host0->GetBounds().origin().ToString());
-  EXPECT_EQ("200x300", host0->GetBounds().size().ToString());
-  EXPECT_EQ("0,0", host1->GetBounds().origin().ToString());
-  EXPECT_EQ("300x400", host1->GetBounds().size().ToString());
+  EXPECT_EQ("400,500", host0->GetBoundsInPixels().origin().ToString());
+  EXPECT_EQ("200x300", host0->GetBoundsInPixels().size().ToString());
+  EXPECT_EQ("0,0", host1->GetBoundsInPixels().origin().ToString());
+  EXPECT_EQ("300x400", host1->GetBoundsInPixels().size().ToString());
 
   UpdateDisplay("100+200-100x200,300+500-200x300");
   ASSERT_EQ(2, display::Screen::GetScreen()->GetNumDisplays());
-  EXPECT_EQ("100,200", host0->GetBounds().origin().ToString());
-  EXPECT_EQ("100x200", host0->GetBounds().size().ToString());
-  EXPECT_EQ("300,500", host1->GetBounds().origin().ToString());
-  EXPECT_EQ("200x300", host1->GetBounds().size().ToString());
+  EXPECT_EQ("100,200", host0->GetBoundsInPixels().origin().ToString());
+  EXPECT_EQ("100x200", host0->GetBoundsInPixels().size().ToString());
+  EXPECT_EQ("300,500", host1->GetBoundsInPixels().origin().ToString());
+  EXPECT_EQ("200x300", host1->GetBoundsInPixels().size().ToString());
 }
 #endif  // defined(OS_CHROMEOS)
 
 TEST_P(DisplayManagerTest, UnifiedDesktopBasic) {
   if (!SupportsMultipleDisplays())
     return;
 
   // Don't check root window destruction in unified mode.
   Shell::GetPrimaryRootWindow()->RemoveObserver(this);
 
@@ skipping 543 matching lines @@
   const display::DisplayLayout& stored =
       layout_store->GetRegisteredDisplayLayout(list);
 
   EXPECT_EQ(id1, stored.placement_list[0].parent_display_id);
   EXPECT_EQ(id2, stored.placement_list[0].display_id);
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace ash