| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/chromeos/note_taking_helper.h" | 5 #include "chrome/browser/chromeos/note_taking_helper.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/ash_switches.h" | 9 #include "ash/ash_switches.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 profile()->GetPrefs()->SetBoolean(prefs::kArcEnabled, | 183 profile()->GetPrefs()->SetBoolean(prefs::kArcEnabled, |
| 184 flags & ENABLE_PLAY_STORE); | 184 flags & ENABLE_PLAY_STORE); |
| 185 arc_test_.SetUp(profile()); | 185 arc_test_.SetUp(profile()); |
| 186 arc::ArcServiceManager::Get() | 186 arc::ArcServiceManager::Get() |
| 187 ->arc_bridge_service() | 187 ->arc_bridge_service() |
| 188 ->intent_helper() | 188 ->intent_helper() |
| 189 ->SetInstance(&intent_helper_); | 189 ->SetInstance(&intent_helper_); |
| 190 | 190 |
| 191 if (flags & ENABLE_PALETTE) { | 191 if (flags & ENABLE_PALETTE) { |
| 192 base::CommandLine::ForCurrentProcess()->AppendSwitch( | 192 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
| 193 ash::switches::kAshForceEnablePalette); | 193 ash::switches::kAshForceEnableStylusTools); |
| 194 } | 194 } |
| 195 | 195 |
| 196 // TODO(derat): Sigh, something in ArcAppTest appears to be re-enabling ARC. | 196 // TODO(derat): Sigh, something in ArcAppTest appears to be re-enabling ARC. |
| 197 profile()->GetPrefs()->SetBoolean(prefs::kArcEnabled, | 197 profile()->GetPrefs()->SetBoolean(prefs::kArcEnabled, |
| 198 flags & ENABLE_PLAY_STORE); | 198 flags & ENABLE_PLAY_STORE); |
| 199 NoteTakingHelper::Initialize(); | 199 NoteTakingHelper::Initialize(); |
| 200 NoteTakingHelper::Get()->set_launch_chrome_app_callback_for_test(base::Bind( | 200 NoteTakingHelper::Get()->set_launch_chrome_app_callback_for_test(base::Bind( |
| 201 &NoteTakingHelperTest::LaunchChromeApp, base::Unretained(this))); | 201 &NoteTakingHelperTest::LaunchChromeApp, base::Unretained(this))); |
| 202 } | 202 } |
| 203 | 203 |
| (...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 749 InitExtensionService(second_profile); | 749 InitExtensionService(second_profile); |
| 750 EXPECT_EQ(0, observer.num_updates()); | 750 EXPECT_EQ(0, observer.num_updates()); |
| 751 InstallExtension(keep_extension.get(), second_profile); | 751 InstallExtension(keep_extension.get(), second_profile); |
| 752 EXPECT_EQ(1, observer.num_updates()); | 752 EXPECT_EQ(1, observer.num_updates()); |
| 753 UninstallExtension(keep_extension.get(), second_profile); | 753 UninstallExtension(keep_extension.get(), second_profile); |
| 754 EXPECT_EQ(2, observer.num_updates()); | 754 EXPECT_EQ(2, observer.num_updates()); |
| 755 profile_manager_->DeleteTestingProfile(kSecondProfileName); | 755 profile_manager_->DeleteTestingProfile(kSecondProfileName); |
| 756 } | 756 } |
| 757 | 757 |
| 758 } // namespace chromeos | 758 } // namespace chromeos |
| OLD | NEW |