OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "app/l10n_util_mac.h" | 5 #include "app/l10n_util_mac.h" |
6 #include "base/gfx/rect.h" | 6 #include "base/gfx/rect.h" |
7 #include "base/keyboard_codes.h" | 7 #include "base/keyboard_codes.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/sys_string_conversions.h" | 9 #include "base/sys_string_conversions.h" |
10 #include "chrome/app/chrome_dll_resource.h" | 10 #include "chrome/app/chrome_dll_resource.h" |
(...skipping 15 matching lines...) Expand all Loading... |
26 #include "chrome/browser/cocoa/status_bubble_mac.h" | 26 #include "chrome/browser/cocoa/status_bubble_mac.h" |
27 #include "chrome/browser/cocoa/task_manager_mac.h" | 27 #include "chrome/browser/cocoa/task_manager_mac.h" |
28 #import "chrome/browser/cocoa/theme_install_bubble_view.h" | 28 #import "chrome/browser/cocoa/theme_install_bubble_view.h" |
29 #include "chrome/browser/browser.h" | 29 #include "chrome/browser/browser.h" |
30 #include "chrome/browser/download/download_shelf.h" | 30 #include "chrome/browser/download/download_shelf.h" |
31 #include "chrome/browser/global_keyboard_shortcuts_mac.h" | 31 #include "chrome/browser/global_keyboard_shortcuts_mac.h" |
32 #include "chrome/browser/tab_contents/tab_contents.h" | 32 #include "chrome/browser/tab_contents/tab_contents.h" |
33 #include "chrome/common/notification_service.h" | 33 #include "chrome/common/notification_service.h" |
34 #include "chrome/common/pref_names.h" | 34 #include "chrome/common/pref_names.h" |
35 #include "chrome/common/pref_service.h" | 35 #include "chrome/common/pref_service.h" |
36 #include "chrome/common/temp_scaffolding_stubs.h" | |
37 #include "chrome/browser/profile.h" | 36 #include "chrome/browser/profile.h" |
38 #include "grit/chromium_strings.h" | 37 #include "grit/chromium_strings.h" |
39 #include "grit/generated_resources.h" | 38 #include "grit/generated_resources.h" |
40 | 39 |
41 BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser, | 40 BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser, |
42 BrowserWindowController* controller, | 41 BrowserWindowController* controller, |
43 NSWindow* window) | 42 NSWindow* window) |
44 : browser_(browser), | 43 : browser_(browser), |
45 controller_(controller) { | 44 controller_(controller) { |
46 // This pref applies to all windows, so all must watch for it. | 45 // This pref applies to all windows, so all must watch for it. |
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
538 void BrowserWindowCocoa::DestroyBrowser() { | 537 void BrowserWindowCocoa::DestroyBrowser() { |
539 [controller_ destroyBrowser]; | 538 [controller_ destroyBrowser]; |
540 | 539 |
541 // at this point the controller is dead (autoreleased), so | 540 // at this point the controller is dead (autoreleased), so |
542 // make sure we don't try to reference it any more. | 541 // make sure we don't try to reference it any more. |
543 } | 542 } |
544 | 543 |
545 NSWindow* BrowserWindowCocoa::window() const { | 544 NSWindow* BrowserWindowCocoa::window() const { |
546 return [controller_ window]; | 545 return [controller_ window]; |
547 } | 546 } |
OLD | NEW |