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

Side by Side Diff: chrome/browser/chromeos/login/kiosk_browsertest.cc

Issue 2258263002: Consistently use namespaced base::Version. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased against master. Created 4 years, 3 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 <memory> 5 #include <memory>
6 #include <vector> 6 #include <vector>
7 7
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/wallpaper/wallpaper_controller.h" 9 #include "ash/wallpaper/wallpaper_controller.h"
10 #include "ash/wallpaper/wallpaper_controller_observer.h" 10 #include "ash/wallpaper/wallpaper_controller_observer.h"
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 635
636 LaunchApp(test_app_id(), false); 636 LaunchApp(test_app_id(), false);
637 } 637 }
638 638
639 const extensions::Extension* GetInstalledApp() { 639 const extensions::Extension* GetInstalledApp() {
640 Profile* app_profile = ProfileManager::GetPrimaryUserProfile(); 640 Profile* app_profile = ProfileManager::GetPrimaryUserProfile();
641 return extensions::ExtensionSystem::Get(app_profile)-> 641 return extensions::ExtensionSystem::Get(app_profile)->
642 extension_service()->GetInstalledExtension(test_app_id_); 642 extension_service()->GetInstalledExtension(test_app_id_);
643 } 643 }
644 644
645 const Version& GetInstalledAppVersion() { 645 const base::Version& GetInstalledAppVersion() {
646 return *GetInstalledApp()->version(); 646 return *GetInstalledApp()->version();
647 } 647 }
648 648
649 extensions::Manifest::Location GetInstalledAppLocation() { 649 extensions::Manifest::Location GetInstalledAppLocation() {
650 return GetInstalledApp()->location(); 650 return GetInstalledApp()->location();
651 } 651 }
652 652
653 void WaitForAppLaunchWithOptions(bool check_launch_data, bool terminate_app) { 653 void WaitForAppLaunchWithOptions(bool check_launch_data, bool terminate_app) {
654 ExtensionTestMessageListener 654 ExtensionTestMessageListener
655 launch_data_check_listener("launchData.isKioskSession = true", false); 655 launch_data_check_listener("launchData.isKioskSession = true", false);
(...skipping 1745 matching lines...) Expand 10 before | Expand all | Expand 10 after
2401 content::WindowedNotificationObserver( 2401 content::WindowedNotificationObserver(
2402 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE, 2402 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
2403 content::NotificationService::AllSources()).Wait(); 2403 content::NotificationService::AllSources()).Wait();
2404 2404
2405 // Wait for the wallpaper to load. 2405 // Wait for the wallpaper to load.
2406 WaitForWallpaper(); 2406 WaitForWallpaper();
2407 EXPECT_TRUE(wallpaper_loaded()); 2407 EXPECT_TRUE(wallpaper_loaded());
2408 } 2408 }
2409 2409
2410 } // namespace chromeos 2410 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698