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

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

Issue 595283002: Move nsview_additions and hyperlink_text_view to ui/base/cocoa (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 <cmath> 7 #include <cmath>
8 #include <numeric> 8 #include <numeric>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #import "chrome/browser/ui/cocoa/dev_tools_controller.h" 49 #import "chrome/browser/ui/cocoa/dev_tools_controller.h"
50 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" 50 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
51 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa .h" 51 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa .h"
52 #import "chrome/browser/ui/cocoa/fast_resize_view.h" 52 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
53 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" 53 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
54 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h" 54 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
55 #import "chrome/browser/ui/cocoa/framed_browser_window.h" 55 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
56 #import "chrome/browser/ui/cocoa/fullscreen_window.h" 56 #import "chrome/browser/ui/cocoa/fullscreen_window.h"
57 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" 57 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
58 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" 58 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
59 #import "chrome/browser/ui/cocoa/nsview_additions.h"
60 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h" 59 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h"
61 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h" 60 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h"
62 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h" 61 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h"
63 #import "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h" 62 #import "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h"
64 #import "chrome/browser/ui/cocoa/status_bubble_mac.h" 63 #import "chrome/browser/ui/cocoa/status_bubble_mac.h"
65 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h" 64 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
66 #import "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h" 65 #import "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h"
67 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h" 66 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
68 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" 67 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
69 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" 68 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
(...skipping 17 matching lines...) Expand all
87 #include "components/bookmarks/browser/bookmark_model.h" 86 #include "components/bookmarks/browser/bookmark_model.h"
88 #include "components/signin/core/common/profile_management_switches.h" 87 #include "components/signin/core/common/profile_management_switches.h"
89 #include "components/translate/core/browser/translate_manager.h" 88 #include "components/translate/core/browser/translate_manager.h"
90 #include "components/translate/core/browser/translate_ui_delegate.h" 89 #include "components/translate/core/browser/translate_ui_delegate.h"
91 #include "components/web_modal/popup_manager.h" 90 #include "components/web_modal/popup_manager.h"
92 #include "components/web_modal/web_contents_modal_dialog_manager.h" 91 #include "components/web_modal/web_contents_modal_dialog_manager.h"
93 #include "content/public/browser/render_view_host.h" 92 #include "content/public/browser/render_view_host.h"
94 #include "content/public/browser/render_widget_host_view.h" 93 #include "content/public/browser/render_widget_host_view.h"
95 #include "content/public/browser/web_contents.h" 94 #include "content/public/browser/web_contents.h"
96 #import "ui/base/cocoa/cocoa_base_utils.h" 95 #import "ui/base/cocoa/cocoa_base_utils.h"
96 #import "ui/base/cocoa/nsview_additions.h"
97 #include "ui/base/l10n/l10n_util.h" 97 #include "ui/base/l10n/l10n_util.h"
98 #include "ui/base/l10n/l10n_util_mac.h" 98 #include "ui/base/l10n/l10n_util_mac.h"
99 #include "ui/gfx/mac/scoped_ns_disable_screen_updates.h" 99 #include "ui/gfx/mac/scoped_ns_disable_screen_updates.h"
100 100
101 using l10n_util::GetStringUTF16; 101 using l10n_util::GetStringUTF16;
102 using l10n_util::GetNSStringWithFixup; 102 using l10n_util::GetNSStringWithFixup;
103 using l10n_util::GetNSStringFWithFixup; 103 using l10n_util::GetNSStringFWithFixup;
104 104
105 // ORGANIZATION: This is a big file. It is (in principle) organized as follows 105 // ORGANIZATION: This is a big file. It is (in principle) organized as follows
106 // (in order): 106 // (in order):
(...skipping 2122 matching lines...) Expand 10 before | Expand all | Expand 10 after
2229 2229
2230 - (BOOL)supportsBookmarkBar { 2230 - (BOOL)supportsBookmarkBar {
2231 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; 2231 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
2232 } 2232 }
2233 2233
2234 - (BOOL)isTabbedWindow { 2234 - (BOOL)isTabbedWindow {
2235 return browser_->is_type_tabbed(); 2235 return browser_->is_type_tabbed();
2236 } 2236 }
2237 2237
2238 @end // @implementation BrowserWindowController(WindowType) 2238 @end // @implementation BrowserWindowController(WindowType)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698