OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h" | 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <map> | 10 #include <map> |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "ash/shelf/shelf_constants.h" | 23 #include "ash/shelf/shelf_constants.h" |
24 #include "ash/shelf/shelf_controller.h" | 24 #include "ash/shelf/shelf_controller.h" |
25 #include "ash/shelf/shelf_model.h" | 25 #include "ash/shelf/shelf_model.h" |
26 #include "ash/shelf/shelf_model_observer.h" | 26 #include "ash/shelf/shelf_model_observer.h" |
27 #include "ash/shell.h" | 27 #include "ash/shell.h" |
28 #include "ash/test/ash_test_helper.h" | 28 #include "ash/test/ash_test_helper.h" |
29 #include "ash/test/shell_test_api.h" | 29 #include "ash/test/shell_test_api.h" |
30 #include "ash/test/test_shell_delegate.h" | 30 #include "ash/test/test_shell_delegate.h" |
31 #include "ash/wm/maximize_mode/maximize_mode_controller.h" | 31 #include "ash/wm/maximize_mode/maximize_mode_controller.h" |
32 #include "ash/wm/window_util.h" | 32 #include "ash/wm/window_util.h" |
33 #include "ash/wm_shell.h" | |
34 #include "base/command_line.h" | 33 #include "base/command_line.h" |
35 #include "base/compiler_specific.h" | 34 #include "base/compiler_specific.h" |
36 #include "base/files/file_path.h" | 35 #include "base/files/file_path.h" |
37 #include "base/json/json_string_value_serializer.h" | 36 #include "base/json/json_string_value_serializer.h" |
38 #include "base/location.h" | 37 #include "base/location.h" |
39 #include "base/macros.h" | 38 #include "base/macros.h" |
40 #include "base/memory/ptr_util.h" | 39 #include "base/memory/ptr_util.h" |
41 #include "base/run_loop.h" | 40 #include "base/run_loop.h" |
42 #include "base/single_thread_task_runner.h" | 41 #include "base/single_thread_task_runner.h" |
43 #include "base/strings/utf_string_conversions.h" | 42 #include "base/strings/utf_string_conversions.h" |
(...skipping 4243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4287 EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, | 4286 EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, |
4288 shelf_controller->auto_hide()); | 4287 shelf_controller->auto_hide()); |
4289 EXPECT_EQ(2u, shelf_controller->auto_hide_change_count()); | 4288 EXPECT_EQ(2u, shelf_controller->auto_hide_change_count()); |
4290 | 4289 |
4291 PrefService* prefs = profile()->GetTestingPrefService(); | 4290 PrefService* prefs = profile()->GetTestingPrefService(); |
4292 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignmentLocal)); | 4291 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignmentLocal)); |
4293 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignment)); | 4292 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignment)); |
4294 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehaviorLocal)); | 4293 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehaviorLocal)); |
4295 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehavior)); | 4294 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehavior)); |
4296 } | 4295 } |
OLD | NEW |