| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "apps/launcher.h" | 5 #include "apps/launcher.h" |
| 6 #include "apps/native_app_window.h" | |
| 7 #include "apps/shell_window.h" | 6 #include "apps/shell_window.h" |
| 8 #include "apps/shell_window_registry.h" | 7 #include "apps/shell_window_registry.h" |
| 8 #include "apps/ui/native_app_window.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "base/file_util.h" | 11 #include "base/file_util.h" |
| 12 #include "base/files/scoped_temp_dir.h" | 12 #include "base/files/scoped_temp_dir.h" |
| 13 #include "base/prefs/pref_service.h" | 13 #include "base/prefs/pref_service.h" |
| 14 #include "base/stl_util.h" | 14 #include "base/stl_util.h" |
| 15 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
| 16 #include "chrome/app/chrome_command_ids.h" | 16 #include "chrome/app/chrome_command_ids.h" |
| 17 #include "chrome/browser/apps/app_browsertest_util.h" | 17 #include "chrome/browser/apps/app_browsertest_util.h" |
| 18 #include "chrome/browser/automation/automation_util.h" | 18 #include "chrome/browser/automation/automation_util.h" |
| (...skipping 1197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1216 false); | 1216 false); |
| 1217 ASSERT_TRUE(restart_requested_listener.WaitUntilSatisfied()); | 1217 ASSERT_TRUE(restart_requested_listener.WaitUntilSatisfied()); |
| 1218 | 1218 |
| 1219 EXPECT_EQ(1, request_restart_call_count()); | 1219 EXPECT_EQ(1, request_restart_call_count()); |
| 1220 } | 1220 } |
| 1221 | 1221 |
| 1222 #endif // defined(OS_CHROMEOS) | 1222 #endif // defined(OS_CHROMEOS) |
| 1223 | 1223 |
| 1224 | 1224 |
| 1225 } // namespace extensions | 1225 } // namespace extensions |
| OLD | NEW |