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

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (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 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>
11 #include <memory> 11 #include <memory>
12 #include <set> 12 #include <set>
13 #include <string> 13 #include <string>
14 #include <utility> 14 #include <utility>
15 #include <vector> 15 #include <vector>
16 16
17 #include "ash/common/shelf/shelf_application_menu_model.h"
18 #include "ash/common/shelf/shelf_constants.h"
19 #include "ash/common/shelf/shelf_controller.h"
20 #include "ash/common/shelf/shelf_item_types.h"
21 #include "ash/common/shelf/shelf_model.h"
22 #include "ash/common/shelf/shelf_model_observer.h"
23 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
24 #include "ash/common/wm_shell.h"
25 #include "ash/display/screen_orientation_controller_chromeos.h" 17 #include "ash/display/screen_orientation_controller_chromeos.h"
18 #include "ash/shelf/shelf_application_menu_model.h"
19 #include "ash/shelf/shelf_constants.h"
20 #include "ash/shelf/shelf_controller.h"
21 #include "ash/shelf/shelf_item_types.h"
22 #include "ash/shelf/shelf_model.h"
23 #include "ash/shelf/shelf_model_observer.h"
26 #include "ash/shell.h" 24 #include "ash/shell.h"
27 #include "ash/test/ash_test_helper.h" 25 #include "ash/test/ash_test_helper.h"
28 #include "ash/test/test_shell_delegate.h" 26 #include "ash/test/test_shell_delegate.h"
27 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
29 #include "ash/wm/window_util.h" 28 #include "ash/wm/window_util.h"
29 #include "ash/wm_shell.h"
30 #include "base/command_line.h" 30 #include "base/command_line.h"
31 #include "base/compiler_specific.h" 31 #include "base/compiler_specific.h"
32 #include "base/files/file_path.h" 32 #include "base/files/file_path.h"
33 #include "base/json/json_string_value_serializer.h" 33 #include "base/json/json_string_value_serializer.h"
34 #include "base/location.h" 34 #include "base/location.h"
35 #include "base/macros.h" 35 #include "base/macros.h"
36 #include "base/memory/ptr_util.h" 36 #include "base/memory/ptr_util.h"
37 #include "base/run_loop.h" 37 #include "base/run_loop.h"
38 #include "base/single_thread_task_runner.h" 38 #include "base/single_thread_task_runner.h"
39 #include "base/strings/utf_string_conversions.h" 39 #include "base/strings/utf_string_conversions.h"
(...skipping 4217 matching lines...) Expand 10 before | Expand all | Expand 10 after
4257 EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, 4257 EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS,
4258 shelf_controller->auto_hide()); 4258 shelf_controller->auto_hide());
4259 EXPECT_EQ(2u, shelf_controller->auto_hide_change_count()); 4259 EXPECT_EQ(2u, shelf_controller->auto_hide_change_count());
4260 4260
4261 PrefService* prefs = profile()->GetTestingPrefService(); 4261 PrefService* prefs = profile()->GetTestingPrefService();
4262 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignmentLocal)); 4262 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignmentLocal));
4263 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignment)); 4263 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignment));
4264 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehaviorLocal)); 4264 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehaviorLocal));
4265 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehavior)); 4265 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehavior));
4266 } 4266 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698