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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/display_info_provider_chromeos_unittest.cc

Issue 1226353004: Generate all extension schema namespaces as "api" and instead vary the generated bundle names. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 5 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/extensions/display_info_provider_chromeos.cc ('k') | chrome/browser/extensions/display_info_provider_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/display_info_provider_chromeos_unittest.cc
diff --git a/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc b/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc
index a6c968b60e034b3af128135d6ccb2c721701dbd8..4429bfac88e47bb2ee3f03d17f2b005caa20a818 100644
--- a/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc
+++ b/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc
@@ -38,7 +38,7 @@ class DisplayInfoProviderChromeosTest : public ash::test::AshTestBase {
protected:
void CallSetDisplayUnitInfo(
const std::string& display_id,
- const core_api::system_display::DisplayProperties& info,
+ const api::system_display::DisplayProperties& info,
bool* success,
std::string* error) {
// Reset error messsage.
@@ -61,14 +61,14 @@ class DisplayInfoProviderChromeosTest : public ash::test::AshTestBase {
}
std::string SystemInfoDisplayInsetsToString(
- const core_api::system_display::Insets& insets) const {
+ const api::system_display::Insets& insets) const {
// Order to match gfx::Insets::ToString().
return base::StringPrintf(
"%d,%d,%d,%d", insets.top, insets.left, insets.bottom, insets.right);
}
std::string SystemInfoDisplayBoundsToString(
- const core_api::system_display::Bounds& bounds) const {
+ const api::system_display::Bounds& bounds) const {
// Order to match gfx::Rect::ToString().
return base::StringPrintf(
"%d,%d %dx%d", bounds.left, bounds.top, bounds.width, bounds.height);
@@ -328,7 +328,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginLeftExact) {
UpdateDisplay("1200x600,520x400");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(-520));
info.bounds_origin_y.reset(new int(50));
@@ -347,7 +347,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginRightExact) {
UpdateDisplay("1200x600,520x400");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(1200));
info.bounds_origin_y.reset(new int(100));
@@ -366,7 +366,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginTopExact) {
UpdateDisplay("1200x600,520x400");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(1100));
info.bounds_origin_y.reset(new int(-400));
@@ -385,7 +385,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginBottomExact) {
UpdateDisplay("1200x600,520x400");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(-350));
info.bounds_origin_y.reset(new int(600));
@@ -404,7 +404,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginSameCenter) {
UpdateDisplay("1200x600,520x400");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(340));
info.bounds_origin_y.reset(new int(100));
@@ -423,7 +423,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginLeftOutside) {
UpdateDisplay("1200x600,520x400");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(-1040));
info.bounds_origin_y.reset(new int(100));
@@ -442,7 +442,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginTopOutside) {
UpdateDisplay("1200x600,520x400");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(-360));
info.bounds_origin_y.reset(new int(-301));
@@ -462,7 +462,7 @@ TEST_F(DisplayInfoProviderChromeosTest,
UpdateDisplay("1200x600,1000x100");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(-650));
info.bounds_origin_y.reset(new int(700));
@@ -481,7 +481,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginRightButSharesTopSide) {
UpdateDisplay("1200x600,1000x100");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(850));
info.bounds_origin_y.reset(new int(-150));
@@ -500,7 +500,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginTopButSharesLeftSide) {
UpdateDisplay("1200x600,1000x100/l");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(-150));
info.bounds_origin_y.reset(new int(-650));
@@ -520,7 +520,7 @@ TEST_F(DisplayInfoProviderChromeosTest,
UpdateDisplay("1200x600,1000x100/l");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(1350));
info.bounds_origin_y.reset(new int(450));
@@ -539,7 +539,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginPrimaryHiDPI) {
UpdateDisplay("1200x600*2,500x500");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(250));
info.bounds_origin_y.reset(new int(-100));
@@ -558,7 +558,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginSecondaryHiDPI) {
UpdateDisplay("1200x600,600x1000*2");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(450));
info.bounds_origin_y.reset(new int(-100));
@@ -577,7 +577,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginOutOfBounds) {
UpdateDisplay("1200x600,600x1000*2");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(0x200001));
info.bounds_origin_y.reset(new int(-100));
@@ -596,7 +596,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginOutOfBoundsNegative) {
UpdateDisplay("1200x600,600x1000*2");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(300));
info.bounds_origin_y.reset(new int(-0x200001));
@@ -615,7 +615,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginMaxValues) {
UpdateDisplay("1200x4600,600x1000*2");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(200000));
info.bounds_origin_y.reset(new int(10));
@@ -634,7 +634,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginOnPrimary) {
UpdateDisplay("1200x600,600x1000*2");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(300));
info.is_primary.reset(new bool(true));
@@ -658,7 +658,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginWithMirroring) {
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
const gfx::Display& primary = ash::Shell::GetScreen()->GetPrimaryDisplay();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(300));
info.mirroring_source_id.reset(
new std::string(base::Int64ToString(primary.id())));
@@ -677,7 +677,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetRotation) {
UpdateDisplay("1200x600,600x1000*2");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.rotation.reset(new int(90));
bool success = false;
@@ -731,7 +731,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetRotation) {
TEST_F(DisplayInfoProviderChromeosTest, SetRotationBeforeMaximizeMode) {
ash::ScreenOrientationController* screen_orientation_controller =
ash::Shell::GetInstance()->screen_orientation_controller();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.rotation.reset(new int(90));
bool success = false;
@@ -775,7 +775,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetRotationDuringMaximizeMode) {
->screen_orientation_controller()
->rotation_locked());
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.rotation.reset(new int(90));
bool success = false;
@@ -794,7 +794,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetInvalidRotation) {
UpdateDisplay("1200x600,600x1000*2");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
+ api::system_display::DisplayProperties info;
info.rotation.reset(new int(91));
bool success = false;
@@ -810,8 +810,8 @@ TEST_F(DisplayInfoProviderChromeosTest, SetNegativeOverscan) {
UpdateDisplay("1200x600,600x1000*2");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
- info.overscan.reset(new core_api::system_display::Insets);
+ api::system_display::DisplayProperties info;
+ info.overscan.reset(new api::system_display::Insets);
info.overscan->left = -10;
bool success = false;
@@ -873,8 +873,8 @@ TEST_F(DisplayInfoProviderChromeosTest, SetOverscanLargerThanHorizontalBounds) {
UpdateDisplay("1200x600,600x1000*2");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
- info.overscan.reset(new core_api::system_display::Insets);
+ api::system_display::DisplayProperties info;
+ info.overscan.reset(new api::system_display::Insets);
// Horizontal overscan is 151, which would make the bounds width 149.
info.overscan->left = 50;
info.overscan->top = 10;
@@ -895,8 +895,8 @@ TEST_F(DisplayInfoProviderChromeosTest, SetOverscanLargerThanVerticalBounds) {
UpdateDisplay("1200x600,600x1000");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
- info.overscan.reset(new core_api::system_display::Insets);
+ api::system_display::DisplayProperties info;
+ info.overscan.reset(new api::system_display::Insets);
// Vertical overscan is 501, which would make the bounds height 499.
info.overscan->left = 20;
info.overscan->top = 250;
@@ -916,8 +916,8 @@ TEST_F(DisplayInfoProviderChromeosTest, SetOverscan) {
UpdateDisplay("1200x600,600x1000*2");
const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- core_api::system_display::DisplayProperties info;
- info.overscan.reset(new core_api::system_display::Insets);
+ api::system_display::DisplayProperties info;
+ info.overscan.reset(new api::system_display::Insets);
info.overscan->left = 20;
info.overscan->top = 199;
info.overscan->right = 130;
@@ -947,8 +947,8 @@ TEST_F(DisplayInfoProviderChromeosTest, SetOverscanForInternal) {
ash::test::DisplayManagerTestApi(GetDisplayManager())
.SetFirstDisplayAsInternalDisplay();
- core_api::system_display::DisplayProperties info;
- info.overscan.reset(new core_api::system_display::Insets);
+ api::system_display::DisplayProperties info;
+ info.overscan.reset(new api::system_display::Insets);
// Vertical overscan is 501, which would make the bounds height 499.
info.overscan->left = 20;
info.overscan->top = 20;
« no previous file with comments | « chrome/browser/extensions/display_info_provider_chromeos.cc ('k') | chrome/browser/extensions/display_info_provider_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698