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

Side by Side Diff: chrome/browser/policy/policy_browsertest.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 #include "ui/base/l10n/l10n_util.h" 190 #include "ui/base/l10n/l10n_util.h"
191 #include "ui/base/page_transition_types.h" 191 #include "ui/base/page_transition_types.h"
192 #include "ui/base/resource/resource_bundle.h" 192 #include "ui/base/resource/resource_bundle.h"
193 #include "ui/display/manager/display_manager.h" 193 #include "ui/display/manager/display_manager.h"
194 #include "url/gurl.h" 194 #include "url/gurl.h"
195 #include "url/origin.h" 195 #include "url/origin.h"
196 196
197 #if defined(OS_CHROMEOS) 197 #if defined(OS_CHROMEOS)
198 #include "ash/accelerators/accelerator_controller.h" 198 #include "ash/accelerators/accelerator_controller.h"
199 #include "ash/accelerators/accelerator_table.h" 199 #include "ash/accelerators/accelerator_table.h"
200 #include "ash/accessibility_types.h" 200 #include "ash/common/accessibility_types.h"
201 #include "ash/common/wm_shell.h"
201 #include "ash/shell.h" 202 #include "ash/shell.h"
202 #include "ash/wm_shell.h"
203 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 203 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
204 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 204 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
205 #include "chrome/browser/chromeos/arc/arc_session_manager.h" 205 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
206 #include "chrome/browser/chromeos/login/test/js_checker.h" 206 #include "chrome/browser/chromeos/login/test/js_checker.h"
207 #include "chrome/browser/chromeos/system/timezone_resolver_manager.h" 207 #include "chrome/browser/chromeos/system/timezone_resolver_manager.h"
208 #include "chrome/browser/profiles/profile_manager.h" 208 #include "chrome/browser/profiles/profile_manager.h"
209 #include "chrome/browser/ui/ash/chrome_screenshot_grabber.h" 209 #include "chrome/browser/ui/ash/chrome_screenshot_grabber.h"
210 #include "chromeos/audio/cras_audio_handler.h" 210 #include "chromeos/audio/cras_audio_handler.h"
211 #include "chromeos/chromeos_switches.h" 211 #include "chromeos/chromeos_switches.h"
212 #include "chromeos/cryptohome/cryptohome_parameters.h" 212 #include "chromeos/cryptohome/cryptohome_parameters.h"
(...skipping 4234 matching lines...) Expand 10 before | Expand all | Expand 10 after
4447 4447
4448 SetEmptyPolicy(); 4448 SetEmptyPolicy();
4449 // Policy not set. 4449 // Policy not set.
4450 CheckSystemTimezoneAutomaticDetectionPolicyUnset(); 4450 CheckSystemTimezoneAutomaticDetectionPolicyUnset();
4451 EXPECT_TRUE(CheckResolveTimezoneByGeolocation(true, false)); 4451 EXPECT_TRUE(CheckResolveTimezoneByGeolocation(true, false));
4452 EXPECT_TRUE(manager->TimeZoneResolverShouldBeRunningForTests()); 4452 EXPECT_TRUE(manager->TimeZoneResolverShouldBeRunningForTests());
4453 } 4453 }
4454 #endif // defined(OS_CHROMEOS) 4454 #endif // defined(OS_CHROMEOS)
4455 4455
4456 } // namespace policy 4456 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698