| 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> |
| 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/ash_switches.h" | |
| 18 #include "ash/common/shelf/shelf_constants.h" | 17 #include "ash/common/shelf/shelf_constants.h" |
| 19 #include "ash/common/shelf/shelf_controller.h" | 18 #include "ash/common/shelf/shelf_controller.h" |
| 20 #include "ash/common/shelf/shelf_item_types.h" | 19 #include "ash/common/shelf/shelf_item_types.h" |
| 21 #include "ash/common/shelf/shelf_model.h" | 20 #include "ash/common/shelf/shelf_model.h" |
| 22 #include "ash/common/shelf/shelf_model_observer.h" | 21 #include "ash/common/shelf/shelf_model_observer.h" |
| 23 #include "ash/common/test/test_session_state_delegate.h" | 22 #include "ash/common/test/test_session_state_delegate.h" |
| 24 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" | 23 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |
| 25 #include "ash/common/wm_shell.h" | 24 #include "ash/common/wm_shell.h" |
| 26 #include "ash/display/screen_orientation_controller_chromeos.h" | 25 #include "ash/display/screen_orientation_controller_chromeos.h" |
| 27 #include "ash/shell.h" | 26 #include "ash/shell.h" |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 class ChromeLauncherControllerImplTest : public BrowserWithTestWindowTest { | 291 class ChromeLauncherControllerImplTest : public BrowserWithTestWindowTest { |
| 293 protected: | 292 protected: |
| 294 ChromeLauncherControllerImplTest() | 293 ChromeLauncherControllerImplTest() |
| 295 : BrowserWithTestWindowTest(Browser::TYPE_TABBED, false) {} | 294 : BrowserWithTestWindowTest(Browser::TYPE_TABBED, false) {} |
| 296 | 295 |
| 297 ~ChromeLauncherControllerImplTest() override {} | 296 ~ChromeLauncherControllerImplTest() override {} |
| 298 | 297 |
| 299 void SetUp() override { | 298 void SetUp() override { |
| 300 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); | 299 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
| 301 command_line->AppendSwitch(switches::kUseFirstDisplayAsInternal); | 300 command_line->AppendSwitch(switches::kUseFirstDisplayAsInternal); |
| 302 command_line->AppendSwitch(ash::switches::kAshEnableTouchViewTesting); | |
| 303 | 301 |
| 304 app_list::AppListSyncableServiceFactory::SetUseInTesting(); | 302 app_list::AppListSyncableServiceFactory::SetUseInTesting(); |
| 305 | 303 |
| 306 BrowserWithTestWindowTest::SetUp(); | 304 BrowserWithTestWindowTest::SetUp(); |
| 307 | 305 |
| 308 if (!profile_manager_) { | 306 if (!profile_manager_) { |
| 309 profile_manager_.reset( | 307 profile_manager_.reset( |
| 310 new TestingProfileManager(TestingBrowserProcess::GetGlobal())); | 308 new TestingProfileManager(TestingBrowserProcess::GetGlobal())); |
| 311 ASSERT_TRUE(profile_manager_->SetUp()); | 309 ASSERT_TRUE(profile_manager_->SetUp()); |
| 312 } | 310 } |
| (...skipping 3823 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4136 | 4134 |
| 4137 // Pinned state should not change. | 4135 // Pinned state should not change. |
| 4138 EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus()); | 4136 EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus()); |
| 4139 launcher_controller_->UnpinAppWithID(extension2_->id()); | 4137 launcher_controller_->UnpinAppWithID(extension2_->id()); |
| 4140 EXPECT_EQ("AppList, Chrome, App1", GetPinnedAppStatus()); | 4138 EXPECT_EQ("AppList, Chrome, App1", GetPinnedAppStatus()); |
| 4141 | 4139 |
| 4142 // Resume syncing and sync information overrides local copy. | 4140 // Resume syncing and sync information overrides local copy. |
| 4143 StartAppSyncService(copy_sync_list); | 4141 StartAppSyncService(copy_sync_list); |
| 4144 EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus()); | 4142 EXPECT_EQ("AppList, Chrome, App1, App2", GetPinnedAppStatus()); |
| 4145 } | 4143 } |
| OLD | NEW |