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

Side by Side Diff: chrome/browser/chromeos/note_taking_helper_unittest.cc

Issue 2644713002: cros: Use runtime stylus detection for ash palette. (Closed)
Patch Set: Fix test Created 3 years, 10 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 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/common/ash_switches.h" 9 #include "ash/common/ash_switches.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 172
173 profile()->GetPrefs()->SetBoolean(prefs::kArcEnabled, flags & ENABLE_ARC); 173 profile()->GetPrefs()->SetBoolean(prefs::kArcEnabled, flags & ENABLE_ARC);
174 arc_test_.SetUp(profile()); 174 arc_test_.SetUp(profile());
175 arc::ArcServiceManager::Get() 175 arc::ArcServiceManager::Get()
176 ->arc_bridge_service() 176 ->arc_bridge_service()
177 ->intent_helper() 177 ->intent_helper()
178 ->SetInstance(&intent_helper_); 178 ->SetInstance(&intent_helper_);
179 179
180 if (flags & ENABLE_PALETTE) { 180 if (flags & ENABLE_PALETTE) {
181 base::CommandLine::ForCurrentProcess()->AppendSwitch( 181 base::CommandLine::ForCurrentProcess()->AppendSwitch(
182 ash::switches::kAshEnablePalette); 182 ash::switches::kAshForceEnablePalette);
183 } 183 }
184 184
185 // TODO(derat): Sigh, something in ArcAppTest appears to be re-enabling ARC. 185 // TODO(derat): Sigh, something in ArcAppTest appears to be re-enabling ARC.
186 profile()->GetPrefs()->SetBoolean(prefs::kArcEnabled, flags & ENABLE_ARC); 186 profile()->GetPrefs()->SetBoolean(prefs::kArcEnabled, flags & ENABLE_ARC);
187 NoteTakingHelper::Initialize(); 187 NoteTakingHelper::Initialize();
188 NoteTakingHelper::Get()->set_launch_chrome_app_callback_for_test(base::Bind( 188 NoteTakingHelper::Get()->set_launch_chrome_app_callback_for_test(base::Bind(
189 &NoteTakingHelperTest::LaunchChromeApp, base::Unretained(this))); 189 &NoteTakingHelperTest::LaunchChromeApp, base::Unretained(this)));
190 } 190 }
191 191
192 // Creates an extension. 192 // Creates an extension.
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 InitExtensionService(second_profile); 688 InitExtensionService(second_profile);
689 EXPECT_EQ(0, observer.num_updates()); 689 EXPECT_EQ(0, observer.num_updates());
690 InstallExtension(keep_extension.get(), second_profile); 690 InstallExtension(keep_extension.get(), second_profile);
691 EXPECT_EQ(1, observer.num_updates()); 691 EXPECT_EQ(1, observer.num_updates());
692 UninstallExtension(keep_extension.get(), second_profile); 692 UninstallExtension(keep_extension.get(), second_profile);
693 EXPECT_EQ(2, observer.num_updates()); 693 EXPECT_EQ(2, observer.num_updates());
694 profile_manager_->DeleteTestingProfile(kSecondProfileName); 694 profile_manager_->DeleteTestingProfile(kSecondProfileName);
695 } 695 }
696 696
697 } // namespace chromeos 697 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/note_taking_helper.cc ('k') | chrome/browser/resources/options/browser_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698