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 1277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1288 | 1288 |
1289 - (void)delayedScreenParametersUpdate { | 1289 - (void)delayedScreenParametersUpdate { |
1290 FOR_EACH_OBSERVER(ui::WorkAreaWatcherObserver, workAreaChangeObservers_, | 1290 FOR_EACH_OBSERVER(ui::WorkAreaWatcherObserver, workAreaChangeObservers_, |
1291 WorkAreaChanged()); | 1291 WorkAreaChanged()); |
1292 } | 1292 } |
1293 | 1293 |
1294 @end // @implementation AppController | 1294 @end // @implementation AppController |
1295 | 1295 |
1296 //--------------------------------------------------------------------------- | 1296 //--------------------------------------------------------------------------- |
1297 | 1297 |
1298 namespace browser { | |
1299 | |
1300 void ShowInstantConfirmDialog(gfx::NativeWindow parent, Profile* profile) { | |
1301 if (Browser* browser = ActivateBrowser(profile)) { | |
1302 chrome::ShowInstantConfirmDialog(browser); | |
1303 } else { | |
1304 chrome::OpenInstantConfirmDialogWindow(profile); | |
1305 } | |
1306 } | |
1307 | |
1308 } // namespace browser | |
1309 | |
1310 namespace app_controller_mac { | 1298 namespace app_controller_mac { |
1311 | 1299 |
1312 bool IsOpeningNewWindow() { | 1300 bool IsOpeningNewWindow() { |
1313 return g_is_opening_new_window; | 1301 return g_is_opening_new_window; |
1314 } | 1302 } |
1315 | 1303 |
1316 } // namespace app_controller_mac | 1304 } // namespace app_controller_mac |
OLD | NEW |