| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_TEST_APP_WINDOW_WAITER_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_TEST_APP_WINDOW_WAITER_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_TEST_APP_WINDOW_WAITER_H_ | 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_TEST_APP_WINDOW_WAITER_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 8 #include <string> | 9 #include <string> |
| 9 | 10 |
| 10 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 11 #include "base/macros.h" | 12 #include "base/macros.h" |
| 12 #include "base/memory/scoped_ptr.h" | |
| 13 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
| 14 #include "extensions/browser/app_window/app_window_registry.h" | 14 #include "extensions/browser/app_window/app_window_registry.h" |
| 15 | 15 |
| 16 namespace extensions { | 16 namespace extensions { |
| 17 class AppWindow; | 17 class AppWindow; |
| 18 } | 18 } |
| 19 | 19 |
| 20 namespace chromeos { | 20 namespace chromeos { |
| 21 | 21 |
| 22 // Helper class that monitors app windows to wait for a window to appear. | 22 // Helper class that monitors app windows to wait for a window to appear. |
| (...skipping 17 matching lines...) Expand all Loading... |
| 40 | 40 |
| 41 private: | 41 private: |
| 42 enum WaitType { | 42 enum WaitType { |
| 43 WAIT_FOR_NONE, | 43 WAIT_FOR_NONE, |
| 44 WAIT_FOR_ADDED, | 44 WAIT_FOR_ADDED, |
| 45 WAIT_FOR_SHOWN, | 45 WAIT_FOR_SHOWN, |
| 46 }; | 46 }; |
| 47 | 47 |
| 48 extensions::AppWindowRegistry* const registry_; | 48 extensions::AppWindowRegistry* const registry_; |
| 49 const std::string app_id_; | 49 const std::string app_id_; |
| 50 scoped_ptr<base::RunLoop> run_loop_; | 50 std::unique_ptr<base::RunLoop> run_loop_; |
| 51 WaitType wait_type_ = WAIT_FOR_NONE; | 51 WaitType wait_type_ = WAIT_FOR_NONE; |
| 52 extensions::AppWindow* window_ = nullptr; | 52 extensions::AppWindow* window_ = nullptr; |
| 53 | 53 |
| 54 DISALLOW_COPY_AND_ASSIGN(AppWindowWaiter); | 54 DISALLOW_COPY_AND_ASSIGN(AppWindowWaiter); |
| 55 }; | 55 }; |
| 56 | 56 |
| 57 } // namespace chromeos | 57 } // namespace chromeos |
| 58 | 58 |
| 59 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_TEST_APP_WINDOW_WAITER_H_ | 59 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_TEST_APP_WINDOW_WAITER_H_ |
| OLD | NEW |