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

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

Issue 5582002: Move:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years 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
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/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/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/global_keyboard_shortcuts_mac.h" 15 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
16 #include "chrome/browser/page_info_window.h" 16 #include "chrome/browser/page_info_window.h"
17 #include "chrome/browser/prefs/pref_service.h" 17 #include "chrome/browser/prefs/pref_service.h"
18 #include "chrome/browser/profile.h" 18 #include "chrome/browser/profile.h"
19 #include "chrome/browser/sidebar/sidebar_container.h" 19 #include "chrome/browser/sidebar/sidebar_container.h"
20 #include "chrome/browser/sidebar/sidebar_manager.h" 20 #include "chrome/browser/sidebar/sidebar_manager.h"
21 #include "chrome/browser/tab_contents/tab_contents.h" 21 #include "chrome/browser/tab_contents/tab_contents.h"
22 #include "chrome/browser/tab_contents_wrapper.h"
23 #include "chrome/browser/ui/browser.h" 22 #include "chrome/browser/ui/browser.h"
24 #include "chrome/browser/ui/browser_list.h" 23 #include "chrome/browser/ui/browser_list.h"
25 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 24 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
26 #import "chrome/browser/ui/cocoa/bug_report_window_controller.h" 25 #import "chrome/browser/ui/cocoa/bug_report_window_controller.h"
27 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" 26 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
28 #import "chrome/browser/ui/cocoa/clear_browsing_data_controller.h" 27 #import "chrome/browser/ui/cocoa/clear_browsing_data_controller.h"
29 #import "chrome/browser/ui/cocoa/collected_cookies_mac.h" 28 #import "chrome/browser/ui/cocoa/collected_cookies_mac.h"
30 #import "chrome/browser/ui/cocoa/content_settings_dialog_controller.h" 29 #import "chrome/browser/ui/cocoa/content_settings_dialog_controller.h"
31 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" 30 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
32 #import "chrome/browser/ui/cocoa/edit_search_engine_cocoa_controller.h" 31 #import "chrome/browser/ui/cocoa/edit_search_engine_cocoa_controller.h"
33 #import "chrome/browser/ui/cocoa/html_dialog_window_controller.h" 32 #import "chrome/browser/ui/cocoa/html_dialog_window_controller.h"
34 #import "chrome/browser/ui/cocoa/import_settings_dialog.h" 33 #import "chrome/browser/ui/cocoa/import_settings_dialog.h"
35 #import "chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h" 34 #import "chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h"
36 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" 35 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
37 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h" 36 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h"
38 #include "chrome/browser/ui/cocoa/repost_form_warning_mac.h" 37 #include "chrome/browser/ui/cocoa/repost_form_warning_mac.h"
39 #include "chrome/browser/ui/cocoa/restart_browser.h" 38 #include "chrome/browser/ui/cocoa/restart_browser.h"
40 #include "chrome/browser/ui/cocoa/status_bubble_mac.h" 39 #include "chrome/browser/ui/cocoa/status_bubble_mac.h"
41 #include "chrome/browser/ui/cocoa/task_manager_mac.h" 40 #include "chrome/browser/ui/cocoa/task_manager_mac.h"
42 #import "chrome/browser/ui/cocoa/theme_install_bubble_view.h" 41 #import "chrome/browser/ui/cocoa/theme_install_bubble_view.h"
43 #import "chrome/browser/ui/cocoa/toolbar_controller.h" 42 #import "chrome/browser/ui/cocoa/toolbar_controller.h"
43 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
44 #include "chrome/common/chrome_switches.h" 44 #include "chrome/common/chrome_switches.h"
45 #include "chrome/common/native_web_keyboard_event.h" 45 #include "chrome/common/native_web_keyboard_event.h"
46 #include "chrome/common/notification_service.h" 46 #include "chrome/common/notification_service.h"
47 #include "chrome/common/pref_names.h" 47 #include "chrome/common/pref_names.h"
48 #include "gfx/rect.h" 48 #include "gfx/rect.h"
49 #include "grit/chromium_strings.h" 49 #include "grit/chromium_strings.h"
50 #include "grit/generated_resources.h" 50 #include "grit/generated_resources.h"
51 51
52 BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser, 52 BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser,
53 BrowserWindowController* controller, 53 BrowserWindowController* controller,
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 629
630 NSWindow* BrowserWindowCocoa::window() const { 630 NSWindow* BrowserWindowCocoa::window() const {
631 return [controller_ window]; 631 return [controller_ window];
632 } 632 }
633 633
634 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) { 634 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) {
635 if (tab_contents == browser_->GetSelectedTabContents()) { 635 if (tab_contents == browser_->GetSelectedTabContents()) {
636 [controller_ updateSidebarForContents:tab_contents]; 636 [controller_ updateSidebarForContents:tab_contents];
637 } 637 }
638 } 638 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698