OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "app/l10n_util_mac.h" | 7 #include "app/l10n_util_mac.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/mac_util.h" | 9 #include "base/mac_util.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 #import "chrome/browser/cocoa/browser_window_cocoa.h" | 22 #import "chrome/browser/cocoa/browser_window_cocoa.h" |
23 #import "chrome/browser/cocoa/browser_window_controller.h" | 23 #import "chrome/browser/cocoa/browser_window_controller.h" |
24 #import "chrome/browser/cocoa/history_menu_bridge.h" | 24 #import "chrome/browser/cocoa/history_menu_bridge.h" |
25 #import "chrome/browser/cocoa/clear_browsing_data_controller.h" | 25 #import "chrome/browser/cocoa/clear_browsing_data_controller.h" |
26 #import "chrome/browser/cocoa/encoding_menu_controller_delegate_mac.h" | 26 #import "chrome/browser/cocoa/encoding_menu_controller_delegate_mac.h" |
27 #import "chrome/browser/cocoa/preferences_window_controller.h" | 27 #import "chrome/browser/cocoa/preferences_window_controller.h" |
28 #import "chrome/browser/cocoa/tab_strip_controller.h" | 28 #import "chrome/browser/cocoa/tab_strip_controller.h" |
29 #import "chrome/browser/cocoa/tab_window_controller.h" | 29 #import "chrome/browser/cocoa/tab_window_controller.h" |
30 #include "chrome/browser/command_updater.h" | 30 #include "chrome/browser/command_updater.h" |
31 #include "chrome/browser/download/download_manager.h" | 31 #include "chrome/browser/download/download_manager.h" |
| 32 #include "chrome/browser/options_window.h" |
| 33 #include "chrome/browser/sessions/tab_restore_service.h" |
32 #include "chrome/browser/tab_contents/tab_contents.h" | 34 #include "chrome/browser/tab_contents/tab_contents.h" |
33 #include "chrome/browser/sessions/tab_restore_service.h" | |
34 #include "chrome/common/chrome_switches.h" | 35 #include "chrome/common/chrome_switches.h" |
35 #include "chrome/common/pref_names.h" | 36 #include "chrome/common/pref_names.h" |
36 #include "chrome/common/pref_service.h" | 37 #include "chrome/common/pref_service.h" |
37 #include "chrome/browser/profile_manager.h" | 38 #include "chrome/browser/profile_manager.h" |
38 #include "chrome/common/temp_scaffolding_stubs.h" | 39 #include "chrome/common/temp_scaffolding_stubs.h" |
39 #include "grit/generated_resources.h" | 40 #include "grit/generated_resources.h" |
40 | 41 |
41 @interface AppController(PRIVATE) | 42 @interface AppController(PRIVATE) |
42 - (void)initMenuState; | 43 - (void)initMenuState; |
43 - (void)openURLs:(const std::vector<GURL>&)urls; | 44 - (void)openURLs:(const std::vector<GURL>&)urls; |
(...skipping 625 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
669 action:@selector(commandDispatch:) | 670 action:@selector(commandDispatch:) |
670 keyEquivalent:@""] autorelease]; | 671 keyEquivalent:@""] autorelease]; |
671 [item setTarget:self]; | 672 [item setTarget:self]; |
672 [item setTag:IDC_NEW_INCOGNITO_WINDOW]; | 673 [item setTag:IDC_NEW_INCOGNITO_WINDOW]; |
673 [result addItem:item]; | 674 [result addItem:item]; |
674 | 675 |
675 return result; | 676 return result; |
676 } | 677 } |
677 | 678 |
678 @end | 679 @end |
| 680 |
| 681 //--------------------------------------------------------------------------- |
| 682 |
| 683 // Stub for cross-platform method that isn't called on Mac OS X. |
| 684 void ShowOptionsWindow(OptionsPage page, |
| 685 OptionsGroup highlight_group, |
| 686 Profile* profile) { |
| 687 NOTIMPLEMENTED(); |
| 688 } |
OLD | NEW |