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

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

Issue 1281313003: base: Remove using:: declaration from version.h header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more fixes Created 5 years, 4 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 <vector> 5 #include <vector>
6 6
7 #include "ash/desktop_background/desktop_background_controller.h" 7 #include "ash/desktop_background/desktop_background_controller.h"
8 #include "ash/desktop_background/desktop_background_controller_observer.h" 8 #include "ash/desktop_background/desktop_background_controller_observer.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 547
548 LaunchApp(test_app_id(), false); 548 LaunchApp(test_app_id(), false);
549 } 549 }
550 550
551 const extensions::Extension* GetInstalledApp() { 551 const extensions::Extension* GetInstalledApp() {
552 Profile* app_profile = ProfileManager::GetPrimaryUserProfile(); 552 Profile* app_profile = ProfileManager::GetPrimaryUserProfile();
553 return extensions::ExtensionSystem::Get(app_profile)-> 553 return extensions::ExtensionSystem::Get(app_profile)->
554 extension_service()->GetInstalledExtension(test_app_id_); 554 extension_service()->GetInstalledExtension(test_app_id_);
555 } 555 }
556 556
557 const Version& GetInstalledAppVersion() { 557 const base::Version& GetInstalledAppVersion() {
558 return *GetInstalledApp()->version(); 558 return *GetInstalledApp()->version();
559 } 559 }
560 560
561 void WaitForAppLaunchWithOptions(bool check_launch_data, bool terminate_app) { 561 void WaitForAppLaunchWithOptions(bool check_launch_data, bool terminate_app) {
562 ExtensionTestMessageListener 562 ExtensionTestMessageListener
563 launch_data_check_listener("launchData.isKioskSession = true", false); 563 launch_data_check_listener("launchData.isKioskSession = true", false);
564 564
565 // Wait for the Kiosk App to launch. 565 // Wait for the Kiosk App to launch.
566 content::WindowedNotificationObserver( 566 content::WindowedNotificationObserver(
567 chrome::NOTIFICATION_KIOSK_APP_LAUNCHED, 567 chrome::NOTIFICATION_KIOSK_APP_LAUNCHED,
(...skipping 1377 matching lines...) Expand 10 before | Expand all | Expand 10 after
1945 content::WindowedNotificationObserver( 1945 content::WindowedNotificationObserver(
1946 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE, 1946 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
1947 content::NotificationService::AllSources()).Wait(); 1947 content::NotificationService::AllSources()).Wait();
1948 1948
1949 // Wait for the wallpaper to load. 1949 // Wait for the wallpaper to load.
1950 WaitForWallpaper(); 1950 WaitForWallpaper();
1951 EXPECT_TRUE(wallpaper_loaded()); 1951 EXPECT_TRUE(wallpaper_loaded());
1952 } 1952 }
1953 1953
1954 } // namespace chromeos 1954 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_win.cc ('k') | chrome/browser/component_updater/component_installers_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698