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/app_shim/app_shim_host_manager_mac.h" | 5 #include "chrome/browser/apps/app_shim/app_shim_host_manager_mac.h" |
6 | 6 |
7 #include <unistd.h> | 7 #include <unistd.h> |
8 | 8 |
9 #include "apps/app_shim/app_shim_handler_mac.h" | |
10 #include "apps/app_shim/app_shim_host_mac.h" | |
11 #include "base/base64.h" | 9 #include "base/base64.h" |
12 #include "base/bind.h" | 10 #include "base/bind.h" |
13 #include "base/command_line.h" | 11 #include "base/command_line.h" |
14 #include "base/files/file_path.h" | 12 #include "base/files/file_path.h" |
15 #include "base/files/file_util.h" | 13 #include "base/files/file_util.h" |
16 #include "base/logging.h" | 14 #include "base/logging.h" |
17 #include "base/path_service.h" | 15 #include "base/path_service.h" |
18 #include "base/sha1.h" | 16 #include "base/sha1.h" |
19 #include "base/strings/string_util.h" | 17 #include "base/strings/string_util.h" |
| 18 #include "chrome/browser/apps/app_shim/app_shim_handler_mac.h" |
| 19 #include "chrome/browser/apps/app_shim/app_shim_host_mac.h" |
20 #include "chrome/browser/browser_process.h" | 20 #include "chrome/browser/browser_process.h" |
21 #include "chrome/common/chrome_paths.h" | 21 #include "chrome/common/chrome_paths.h" |
22 #include "chrome/common/chrome_switches.h" | 22 #include "chrome/common/chrome_switches.h" |
23 #include "chrome/common/chrome_version_info.h" | 23 #include "chrome/common/chrome_version_info.h" |
24 #include "chrome/common/mac/app_mode_common.h" | 24 #include "chrome/common/mac/app_mode_common.h" |
25 | 25 |
26 using content::BrowserThread; | 26 using content::BrowserThread; |
27 | 27 |
28 namespace { | 28 namespace { |
29 | 29 |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 BrowserThread::UI, FROM_HERE, | 159 BrowserThread::UI, FROM_HERE, |
160 base::Bind(&CreateAppShimHost, handle)); | 160 base::Bind(&CreateAppShimHost, handle)); |
161 } | 161 } |
162 | 162 |
163 void AppShimHostManager::OnListenError() { | 163 void AppShimHostManager::OnListenError() { |
164 // TODO(tapted): Set a timeout and attempt to reconstruct the channel. Until | 164 // TODO(tapted): Set a timeout and attempt to reconstruct the channel. Until |
165 // cases where the error could occur are better known, just reset the acceptor | 165 // cases where the error could occur are better known, just reset the acceptor |
166 // to allow failure to be communicated via the test API. | 166 // to allow failure to be communicated via the test API. |
167 acceptor_.reset(); | 167 acceptor_.reset(); |
168 } | 168 } |
OLD | NEW |