chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc - Issue 682943002: Make chrome/browser/chromeos/accessibility compile on Athena with use_ash=0

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc

Issue 682943002: Make chrome/browser/chromeos/accessibility compile on Athena with use_ash=0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash41_scroll_end_effect

Patch Set: Created 6 years, 2 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/chromeos/policy/configuration_policy_handler_chromeos.cc ('k') | chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc

diff --git a/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc b/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc

index 4349e208a05d4cc5fe1fbfa45cbb77561e3fece6..0114da85a56b2556addd319321f0abb135521451 100644

--- a/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc

+++ b/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc

@@ -4,7 +4,6 @@

#include <string>

-#include "ash/magnifier/magnifier_constants.h"

#include "base/basictypes.h"

#include "base/bind.h"

#include "base/bind_helpers.h"

@@ -28,6 +27,7 @@

#include "chrome/common/pref_names.h"

#include "chromeos/chromeos_switches.h"

#include "testing/gtest/include/gtest/gtest.h"

+#include "ui/chromeos/accessibility_types.h"

namespace em = enterprise_management;

@@ -326,14 +326,14 @@ IN_PROC_BROWSER_TEST_F(LoginScreenDefaultPolicyLoginScreenBrowsertest,

VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierEnabled,

base::FundamentalValue(true));

VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierType,

- base::FundamentalValue(ash::MAGNIFIER_FULL));

+ base::FundamentalValue(ui::MAGNIFIER_FULL));

// Verify that the full-screen magnifier is enabled.

chromeos::MagnificationManager* magnification_manager =

chromeos::MagnificationManager::Get();

ASSERT_TRUE(magnification_manager);

EXPECT_TRUE(magnification_manager->IsMagnifierEnabled());

- EXPECT_EQ(ash::MAGNIFIER_FULL, magnification_manager->GetMagnifierType());

+ EXPECT_EQ(ui::MAGNIFIER_FULL, magnification_manager->GetMagnifierType());

}

IN_PROC_BROWSER_TEST_F(LoginScreenDefaultPolicyInSessionBrowsertest,

@@ -434,7 +434,7 @@ IN_PROC_BROWSER_TEST_F(LoginScreenDefaultPolicyInSessionBrowsertest,

chromeos::MagnificationManager::Get();

ASSERT_TRUE(magnification_manager);

EXPECT_FALSE(magnification_manager->IsMagnifierEnabled());

- EXPECT_EQ(ash::kDefaultMagnifierType,

+ EXPECT_EQ(ui::kDefaultMagnifierType,

magnification_manager->GetMagnifierType());

}