OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #import "chrome/browser/app_controller_mac.h" | 5 #import "chrome/browser/app_controller_mac.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 // framework's path or the initial app's path, which may be an app mode shim | 156 // framework's path or the initial app's path, which may be an app mode shim |
157 // or a unit test.) | 157 // or a unit test.) |
158 FilePath appBundlePath = | 158 FilePath appBundlePath = |
159 chrome::GetVersionedDirectory().DirName().DirName().DirName(); | 159 chrome::GetVersionedDirectory().DirName().DirName().DirName(); |
160 CFPreferencesSetAppValue( | 160 CFPreferencesSetAppValue( |
161 base::mac::NSToCFCast(app_mode::kLastRunAppBundlePathPrefsKey), | 161 base::mac::NSToCFCast(app_mode::kLastRunAppBundlePathPrefsKey), |
162 base::SysUTF8ToCFStringRef(appBundlePath.value()), | 162 base::SysUTF8ToCFStringRef(appBundlePath.value()), |
163 BaseBundleID_CFString()); | 163 BaseBundleID_CFString()); |
164 | 164 |
165 // Sync after a delay avoid I/O contention on startup; 1500 ms is plenty. | 165 // Sync after a delay avoid I/O contention on startup; 1500 ms is plenty. |
166 BrowserThread::PostDelayedTask(BrowserThread::FILE, FROM_HERE, | 166 BrowserThread::PostDelayedTask( |
167 base::Bind(&PrefsSyncCallback), 1500); | 167 BrowserThread::FILE, FROM_HERE, |
| 168 base::Bind(&PrefsSyncCallback), |
| 169 base::TimeDelta::FromMilliseconds(1500)); |
168 } | 170 } |
169 | 171 |
170 } // anonymous namespace | 172 } // anonymous namespace |
171 | 173 |
172 const AEEventClass kAECloudPrintInstallClass = 'GCPi'; | 174 const AEEventClass kAECloudPrintInstallClass = 'GCPi'; |
173 const AEEventClass kAECloudPrintUninstallClass = 'GCPu'; | 175 const AEEventClass kAECloudPrintUninstallClass = 'GCPu'; |
174 | 176 |
175 @interface AppController (Private) | 177 @interface AppController (Private) |
176 - (void)initMenuState; | 178 - (void)initMenuState; |
177 - (void)initProfileMenu; | 179 - (void)initProfileMenu; |
(...skipping 1138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1316 | 1318 |
1317 } // namespace browser | 1319 } // namespace browser |
1318 | 1320 |
1319 namespace app_controller_mac { | 1321 namespace app_controller_mac { |
1320 | 1322 |
1321 bool IsOpeningNewWindow() { | 1323 bool IsOpeningNewWindow() { |
1322 return g_is_opening_new_window; | 1324 return g_is_opening_new_window; |
1323 } | 1325 } |
1324 | 1326 |
1325 } // namespace app_controller_mac | 1327 } // namespace app_controller_mac |
OLD | NEW |