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

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

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: 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/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 17 matching lines...) Expand all
28 #import "chrome/browser/cocoa/nsmenuitem_additions.h" 28 #import "chrome/browser/cocoa/nsmenuitem_additions.h"
29 #include "chrome/browser/cocoa/page_info_window_mac.h" 29 #include "chrome/browser/cocoa/page_info_window_mac.h"
30 #include "chrome/browser/cocoa/repost_form_warning_mac.h" 30 #include "chrome/browser/cocoa/repost_form_warning_mac.h"
31 #include "chrome/browser/cocoa/restart_browser.h" 31 #include "chrome/browser/cocoa/restart_browser.h"
32 #include "chrome/browser/cocoa/status_bubble_mac.h" 32 #include "chrome/browser/cocoa/status_bubble_mac.h"
33 #include "chrome/browser/cocoa/task_manager_mac.h" 33 #include "chrome/browser/cocoa/task_manager_mac.h"
34 #import "chrome/browser/cocoa/theme_install_bubble_view.h" 34 #import "chrome/browser/cocoa/theme_install_bubble_view.h"
35 #import "chrome/browser/cocoa/toolbar_controller.h" 35 #import "chrome/browser/cocoa/toolbar_controller.h"
36 #include "chrome/browser/download/download_shelf.h" 36 #include "chrome/browser/download/download_shelf.h"
37 #include "chrome/browser/global_keyboard_shortcuts_mac.h" 37 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
38 #include "chrome/browser/pref_service.h" 38 #include "chrome/browser/prefs/pref_service.h"
39 #include "chrome/browser/profile.h" 39 #include "chrome/browser/profile.h"
40 #include "chrome/browser/tab_contents/tab_contents.h" 40 #include "chrome/browser/tab_contents/tab_contents.h"
41 #include "chrome/common/chrome_switches.h" 41 #include "chrome/common/chrome_switches.h"
42 #include "chrome/common/native_web_keyboard_event.h" 42 #include "chrome/common/native_web_keyboard_event.h"
43 #include "chrome/common/notification_service.h" 43 #include "chrome/common/notification_service.h"
44 #include "chrome/common/pref_names.h" 44 #include "chrome/common/pref_names.h"
45 #include "gfx/rect.h" 45 #include "gfx/rect.h"
46 #include "grit/chromium_strings.h" 46 #include "grit/chromium_strings.h"
47 #include "grit/generated_resources.h" 47 #include "grit/generated_resources.h"
48 48
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 void BrowserWindowCocoa::DestroyBrowser() { 578 void BrowserWindowCocoa::DestroyBrowser() {
579 [controller_ destroyBrowser]; 579 [controller_ destroyBrowser];
580 580
581 // at this point the controller is dead (autoreleased), so 581 // at this point the controller is dead (autoreleased), so
582 // make sure we don't try to reference it any more. 582 // make sure we don't try to reference it any more.
583 } 583 }
584 584
585 NSWindow* BrowserWindowCocoa::window() const { 585 NSWindow* BrowserWindowCocoa::window() const {
586 return [controller_ window]; 586 return [controller_ window];
587 } 587 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698