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

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

Issue 7200045: Move app/mac/ files to ui/gfx/mac/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 6 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
OLDNEW
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 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 5 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
6 6
7 #include <Carbon/Carbon.h> 7 #include <Carbon/Carbon.h>
8 8
9 #include "app/mac/scoped_nsdisable_screen_updates.h"
10 #include "app/mac/nsimage_cache.h"
11 #include "base/mac/mac_util.h" 9 #include "base/mac/mac_util.h"
12 #import "base/memory/scoped_nsobject.h" 10 #import "base/memory/scoped_nsobject.h"
13 #include "base/sys_string_conversions.h" 11 #include "base/sys_string_conversions.h"
14 #include "chrome/app/chrome_command_ids.h" // IDC_* 12 #include "chrome/app/chrome_command_ids.h" // IDC_*
15 #include "chrome/browser/bookmarks/bookmark_editor.h" 13 #include "chrome/browser/bookmarks/bookmark_editor.h"
16 #include "chrome/browser/google/google_util.h" 14 #include "chrome/browser/google/google_util.h"
17 #include "chrome/browser/instant/instant_controller.h" 15 #include "chrome/browser/instant/instant_controller.h"
18 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/browser/sync/profile_sync_service.h" 17 #include "chrome/browser/sync/profile_sync_service.h"
20 #include "chrome/browser/sync/sync_ui_util_mac.h" 18 #include "chrome/browser/sync/sync_ui_util_mac.h"
(...skipping 18 matching lines...) Expand all
39 #import "chrome/browser/ui/cocoa/fullscreen_controller.h" 37 #import "chrome/browser/ui/cocoa/fullscreen_controller.h"
40 #import "chrome/browser/ui/cocoa/fullscreen_window.h" 38 #import "chrome/browser/ui/cocoa/fullscreen_window.h"
41 #import "chrome/browser/ui/cocoa/image_utils.h" 39 #import "chrome/browser/ui/cocoa/image_utils.h"
42 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" 40 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
43 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" 41 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
44 #import "chrome/browser/ui/cocoa/sidebar_controller.h" 42 #import "chrome/browser/ui/cocoa/sidebar_controller.h"
45 #import "chrome/browser/ui/cocoa/status_bubble_mac.h" 43 #import "chrome/browser/ui/cocoa/status_bubble_mac.h"
46 #import "chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h" 44 #import "chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h"
47 #import "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h" 45 #import "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h"
48 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h" 46 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
47 #import "chrome/browser/ui/cocoa/tabpose_window.h"
49 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" 48 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
50 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" 49 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
51 #import "chrome/browser/ui/cocoa/tabs/tab_view.h" 50 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
52 #import "chrome/browser/ui/cocoa/tabpose_window.h"
53 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 51 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
54 #include "chrome/browser/ui/omnibox/location_bar.h" 52 #include "chrome/browser/ui/omnibox/location_bar.h"
55 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 53 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
56 #include "chrome/browser/ui/tabs/dock_info.h" 54 #include "chrome/browser/ui/tabs/dock_info.h"
57 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" 55 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
58 #include "chrome/browser/ui/window_sizer.h" 56 #include "chrome/browser/ui/window_sizer.h"
59 #include "chrome/common/url_constants.h" 57 #include "chrome/common/url_constants.h"
60 #include "content/browser/renderer_host/render_widget_host_view.h" 58 #include "content/browser/renderer_host/render_widget_host_view.h"
61 #include "content/browser/tab_contents/tab_contents.h" 59 #include "content/browser/tab_contents/tab_contents.h"
62 #include "grit/generated_resources.h" 60 #include "grit/generated_resources.h"
63 #include "grit/locale_settings.h" 61 #include "grit/locale_settings.h"
64 #include "ui/base/l10n/l10n_util.h" 62 #include "ui/base/l10n/l10n_util.h"
65 #include "ui/base/l10n/l10n_util_mac.h" 63 #include "ui/base/l10n/l10n_util_mac.h"
64 #include "ui/gfx/mac/nsimage_cache.h"
65 #include "ui/gfx/mac/scoped_nsdisable_screen_updates.h"
66 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" 66 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
67 67
68 68
69 // ORGANIZATION: This is a big file. It is (in principle) organized as follows 69 // ORGANIZATION: This is a big file. It is (in principle) organized as follows
70 // (in order): 70 // (in order):
71 // 1. Interfaces. Very short, one-time-use classes may include an implementation 71 // 1. Interfaces. Very short, one-time-use classes may include an implementation
72 // immediately after their interface. 72 // immediately after their interface.
73 // 2. The general implementation section, ordered as follows: 73 // 2. The general implementation section, ordered as follows:
74 // i. Public methods and overrides. 74 // i. Public methods and overrides.
75 // ii. Overrides/implementations of undocumented methods. 75 // ii. Overrides/implementations of undocumented methods.
(...skipping 2129 matching lines...) Expand 10 before | Expand all | Expand 10 after
2205 2205
2206 - (BOOL)supportsBookmarkBar { 2206 - (BOOL)supportsBookmarkBar {
2207 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; 2207 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
2208 } 2208 }
2209 2209
2210 - (BOOL)isTabbedWindow { 2210 - (BOOL)isTabbedWindow {
2211 return browser_->is_type_tabbed(); 2211 return browser_->is_type_tabbed();
2212 } 2212 }
2213 2213
2214 @end // @implementation BrowserWindowController(WindowType) 2214 @end // @implementation BrowserWindowController(WindowType)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698