chrome/browser/ui/cocoa/browser_window_cocoa.mm - Issue 8068020: Converts usage of GetBrowserViewForNativeWindow to

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

Issue 8068020: Converts usage of GetBrowserViewForNativeWindow to (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Incorporate review feedback, and make ShowPageInfo platform specific Created 9 years, 2 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 | « chrome/browser/tab_contents/render_view_context_menu.cc ('k') | chrome/browser/ui/cocoa/page_info_window.h » ('j') | chrome/browser/ui/cocoa/page_info_window.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "base/bind.h"	7 #include "base/bind.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/sys_string_conversions.h"	11 #include "base/sys_string_conversions.h"

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

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

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

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

16 #include "chrome/browser/prefs/pref_service.h"	15 #include "chrome/browser/prefs/pref_service.h"

17 #include "chrome/browser/profiles/profile.h"	16 #include "chrome/browser/profiles/profile.h"

18 #include "chrome/browser/sidebar/sidebar_container.h"	17 #include "chrome/browser/sidebar/sidebar_container.h"

19 #include "chrome/browser/sidebar/sidebar_manager.h"	18 #include "chrome/browser/sidebar/sidebar_manager.h"

20 #include "chrome/browser/ui/browser.h"	19 #include "chrome/browser/ui/browser.h"

21 #include "chrome/browser/ui/browser_list.h"	20 #include "chrome/browser/ui/browser_list.h"

22 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h"	21 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h"

23 #import "chrome/browser/ui/cocoa/browser_window_controller.h"	22 #import "chrome/browser/ui/cocoa/browser_window_controller.h"

24 #import "chrome/browser/ui/cocoa/browser_window_utils.h"	23 #import "chrome/browser/ui/cocoa/browser_window_utils.h"

25 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"	24 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"

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

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

28 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"	27 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"

29 #import "chrome/browser/ui/cocoa/html_dialog_window_controller.h"	28 #import "chrome/browser/ui/cocoa/html_dialog_window_controller.h"

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

31 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h"	30 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h"

	31 #include "chrome/browser/ui/cocoa/page_info_window.h"

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

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

34 #include "chrome/browser/ui/cocoa/status_bubble_mac.h"	34 #include "chrome/browser/ui/cocoa/status_bubble_mac.h"

35 #include "chrome/browser/ui/cocoa/task_manager_mac.h"	35 #include "chrome/browser/ui/cocoa/task_manager_mac.h"

36 #import "chrome/browser/ui/cocoa/theme_install_bubble_view.h"	36 #import "chrome/browser/ui/cocoa/theme_install_bubble_view.h"

37 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"	37 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"

38 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"	38 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

39 #include "chrome/common/chrome_notification_types.h"	39 #include "chrome/common/chrome_notification_types.h"

40 #include "chrome/common/pref_names.h"	40 #include "chrome/common/pref_names.h"

41 #include "content/browser/tab_contents/tab_contents.h"	41 #include "content/browser/tab_contents/tab_contents.h"

(...skipping 526 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
568	568

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

570 return [controller_ window];	570 return [controller_ window];

571 }	571 }

572	572

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

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

575 [controller_ updateSidebarForContents:tab_contents];	575 [controller_ updateSidebarForContents:tab_contents];

576 }	576 }

577 }	577 }

OLD	NEW