Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(343)

Side by Side Diff: chrome/browser/cocoa/browser_window_cocoa.mm

Issue 3145001: FBTF: Clean up task.h in x11_util.h and header usage in some delegates. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: more Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "chrome/browser/cocoa/browser_window_cocoa.h" 5 #include "chrome/browser/cocoa/browser_window_cocoa.h"
6 6
7 #include "app/l10n_util_mac.h" 7 #include "app/l10n_util_mac.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/sys_string_conversions.h" 10 #include "base/sys_string_conversions.h"
(...skipping 19 matching lines...) Expand all
30 #include "chrome/browser/cocoa/restart_browser.h" 30 #include "chrome/browser/cocoa/restart_browser.h"
31 #include "chrome/browser/cocoa/status_bubble_mac.h" 31 #include "chrome/browser/cocoa/status_bubble_mac.h"
32 #include "chrome/browser/cocoa/task_manager_mac.h" 32 #include "chrome/browser/cocoa/task_manager_mac.h"
33 #import "chrome/browser/cocoa/theme_install_bubble_view.h" 33 #import "chrome/browser/cocoa/theme_install_bubble_view.h"
34 #import "chrome/browser/cocoa/toolbar_controller.h" 34 #import "chrome/browser/cocoa/toolbar_controller.h"
35 #include "chrome/browser/download/download_shelf.h" 35 #include "chrome/browser/download/download_shelf.h"
36 #include "chrome/browser/global_keyboard_shortcuts_mac.h" 36 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
37 #include "chrome/browser/pref_service.h" 37 #include "chrome/browser/pref_service.h"
38 #include "chrome/browser/profile.h" 38 #include "chrome/browser/profile.h"
39 #include "chrome/browser/tab_contents/tab_contents.h" 39 #include "chrome/browser/tab_contents/tab_contents.h"
40 #include "chrome/common/native_web_keyboard_event.h"
40 #include "chrome/common/notification_service.h" 41 #include "chrome/common/notification_service.h"
41 #include "chrome/common/pref_names.h" 42 #include "chrome/common/pref_names.h"
42 #include "gfx/rect.h" 43 #include "gfx/rect.h"
43 #include "grit/chromium_strings.h" 44 #include "grit/chromium_strings.h"
44 #include "grit/generated_resources.h" 45 #include "grit/generated_resources.h"
45 46
46 BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser, 47 BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser,
47 BrowserWindowController* controller, 48 BrowserWindowController* controller,
48 NSWindow* window) 49 NSWindow* window)
49 : browser_(browser), 50 : browser_(browser),
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 void BrowserWindowCocoa::DestroyBrowser() { 575 void BrowserWindowCocoa::DestroyBrowser() {
575 [controller_ destroyBrowser]; 576 [controller_ destroyBrowser];
576 577
577 // at this point the controller is dead (autoreleased), so 578 // at this point the controller is dead (autoreleased), so
578 // make sure we don't try to reference it any more. 579 // make sure we don't try to reference it any more.
579 } 580 }
580 581
581 NSWindow* BrowserWindowCocoa::window() const { 582 NSWindow* BrowserWindowCocoa::window() const {
582 return [controller_ window]; 583 return [controller_ window];
583 } 584 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/wm_overview_title.cc ('k') | chrome/browser/cocoa/content_blocked_bubble_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698