chrome/browser/ui/cocoa/browser_window_cocoa.mm - Issue 6294008: [Mac] Organize some files into chrome/browser/ui/cocoa/content_settings/....

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

Issue 6294008: [Mac] Organize some files into chrome/browser/ui/cocoa/content_settings/.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 11 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 | Annotate | Revision Log

« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/collected_cookies_mac.h » ('j') | chrome/browser/ui/cocoa/content_settings/OWNERS » ('J')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/ui/cocoa/browser_window_cocoa.h"	5 #include "chrome/browser/ui/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"

11 #include "base/mac/mac_util.h"	11 #include "base/mac/mac_util.h"

12 #include "base/sys_string_conversions.h"	12 #include "base/sys_string_conversions.h"

13 #include "chrome/app/chrome_command_ids.h"	13 #include "chrome/app/chrome_command_ids.h"

14 #include "chrome/browser/bookmarks/bookmark_utils.h"	14 #include "chrome/browser/bookmarks/bookmark_utils.h"

15 #include "chrome/browser/download/download_shelf.h"	15 #include "chrome/browser/download/download_shelf.h"

16 #include "chrome/browser/global_keyboard_shortcuts_mac.h"	16 #include "chrome/browser/global_keyboard_shortcuts_mac.h"

17 #include "chrome/browser/page_info_window.h"	17 #include "chrome/browser/page_info_window.h"

18 #include "chrome/browser/prefs/pref_service.h"	18 #include "chrome/browser/prefs/pref_service.h"

19 #include "chrome/browser/profiles/profile.h"	19 #include "chrome/browser/profiles/profile.h"

20 #include "chrome/browser/sidebar/sidebar_container.h"	20 #include "chrome/browser/sidebar/sidebar_container.h"

21 #include "chrome/browser/sidebar/sidebar_manager.h"	21 #include "chrome/browser/sidebar/sidebar_manager.h"

22 #include "chrome/browser/tab_contents/tab_contents.h"	22 #include "chrome/browser/tab_contents/tab_contents.h"

23 #include "chrome/browser/ui/browser.h"	23 #include "chrome/browser/ui/browser.h"

24 #include "chrome/browser/ui/browser_list.h"	24 #include "chrome/browser/ui/browser_list.h"

25 #import "chrome/browser/ui/cocoa/browser_window_controller.h"	25 #import "chrome/browser/ui/cocoa/browser_window_controller.h"

26 #import "chrome/browser/ui/cocoa/bug_report_window_controller.h"	26 #import "chrome/browser/ui/cocoa/bug_report_window_controller.h"

27 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"	27 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"

28 #import "chrome/browser/ui/cocoa/clear_browsing_data_controller.h"	28 #import "chrome/browser/ui/cocoa/clear_browsing_data_controller.h"

29 #import "chrome/browser/ui/cocoa/collected_cookies_mac.h"	29 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h"

30 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"	30 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"

31 #import "chrome/browser/ui/cocoa/html_dialog_window_controller.h"	31 #import "chrome/browser/ui/cocoa/html_dialog_window_controller.h"

32 #import "chrome/browser/ui/cocoa/importer/import_settings_dialog.h"	32 #import "chrome/browser/ui/cocoa/importer/import_settings_dialog.h"

33 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"	33 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"

34 #import "chrome/browser/ui/cocoa/options/content_settings_dialog_controller.h"	34 #import "chrome/browser/ui/cocoa/options/content_settings_dialog_controller.h"

35 #import "chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.h"	35 #import "chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.h"

36 #import "chrome/browser/ui/cocoa/options/keyword_editor_cocoa_controller.h"	36 #import "chrome/browser/ui/cocoa/options/keyword_editor_cocoa_controller.h"

37 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h"	37 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h"

38 #include "chrome/browser/ui/cocoa/repost_form_warning_mac.h"	38 #include "chrome/browser/ui/cocoa/repost_form_warning_mac.h"

39 #include "chrome/browser/ui/cocoa/restart_browser.h"	39 #include "chrome/browser/ui/cocoa/restart_browser.h"

(...skipping 595 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
635	635

636 NSWindow* BrowserWindowCocoa::window() const {	636 NSWindow* BrowserWindowCocoa::window() const {

637 return [controller_ window];	637 return [controller_ window];

638 }	638 }

639	639

640 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) {	640 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) {

641 if (tab_contents == browser_->GetSelectedTabContents()) {	641 if (tab_contents == browser_->GetSelectedTabContents()) {

642 [controller_ updateSidebarForContents:tab_contents];	642 [controller_ updateSidebarForContents:tab_contents];

643 }	643 }

644 }	644 }

OLD	NEW