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

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

Issue 14969012: components: Create web_modal component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-before-land Created 7 years, 7 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 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" 59 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
60 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" 60 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
61 #import "chrome/browser/ui/cocoa/tabs/tab_view.h" 61 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
62 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 62 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
63 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" 63 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
64 #include "chrome/browser/ui/omnibox/location_bar.h" 64 #include "chrome/browser/ui/omnibox/location_bar.h"
65 #include "chrome/browser/ui/tabs/dock_info.h" 65 #include "chrome/browser/ui/tabs/dock_info.h"
66 #include "chrome/browser/ui/tabs/tab_strip_model.h" 66 #include "chrome/browser/ui/tabs/tab_strip_model.h"
67 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" 67 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
68 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" 68 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
69 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
70 #include "chrome/browser/ui/window_sizer/window_sizer.h" 69 #include "chrome/browser/ui/window_sizer/window_sizer.h"
71 #include "chrome/common/chrome_switches.h" 70 #include "chrome/common/chrome_switches.h"
72 #include "chrome/common/url_constants.h" 71 #include "chrome/common/url_constants.h"
72 #include "components/web_modal/web_contents_modal_dialog_manager.h"
73 #include "content/public/browser/render_view_host.h" 73 #include "content/public/browser/render_view_host.h"
74 #include "content/public/browser/render_widget_host_view.h" 74 #include "content/public/browser/render_widget_host_view.h"
75 #include "content/public/browser/web_contents.h" 75 #include "content/public/browser/web_contents.h"
76 #include "grit/chromium_strings.h" 76 #include "grit/chromium_strings.h"
77 #include "grit/generated_resources.h" 77 #include "grit/generated_resources.h"
78 #include "grit/locale_settings.h" 78 #include "grit/locale_settings.h"
79 #include "ui/base/l10n/l10n_util.h" 79 #include "ui/base/l10n/l10n_util.h"
80 #include "ui/base/l10n/l10n_util_mac.h" 80 #include "ui/base/l10n/l10n_util_mac.h"
81 #include "ui/gfx/mac/scoped_ns_disable_screen_updates.h" 81 #include "ui/gfx/mac/scoped_ns_disable_screen_updates.h"
82 82
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 // any shrink whether we're both zoomed and have previously grown -- if so, we 155 // any shrink whether we're both zoomed and have previously grown -- if so, we
156 // set a flag, and constrain any resize by the allowed amounts. On further 156 // set a flag, and constrain any resize by the allowed amounts. On further
157 // shrinks, we check the flag (since the size/position of the window will no 157 // shrinks, we check the flag (since the size/position of the window will no
158 // longer indicate that the window is shrinking from an apparent zoomed state) 158 // longer indicate that the window is shrinking from an apparent zoomed state)
159 // and if it's set we continue to constrain the resize. 159 // and if it's set we continue to constrain the resize.
160 160
161 using content::OpenURLParams; 161 using content::OpenURLParams;
162 using content::Referrer; 162 using content::Referrer;
163 using content::RenderWidgetHostView; 163 using content::RenderWidgetHostView;
164 using content::WebContents; 164 using content::WebContents;
165 using web_modal::WebContentsModalDialogManager;
165 166
166 @interface NSWindow (NSPrivateApis) 167 @interface NSWindow (NSPrivateApis)
167 // Note: These functions are private, use -[NSObject respondsToSelector:] 168 // Note: These functions are private, use -[NSObject respondsToSelector:]
168 // before calling them. 169 // before calling them.
169 170
170 - (void)setBottomCornerRounded:(BOOL)rounded; 171 - (void)setBottomCornerRounded:(BOOL)rounded;
171 172
172 - (NSRect)_growBoxRect; 173 - (NSRect)_growBoxRect;
173 174
174 @end 175 @end
(...skipping 2055 matching lines...) Expand 10 before | Expand all | Expand 10 after
2230 2231
2231 - (BOOL)supportsBookmarkBar { 2232 - (BOOL)supportsBookmarkBar {
2232 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; 2233 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
2233 } 2234 }
2234 2235
2235 - (BOOL)isTabbedWindow { 2236 - (BOOL)isTabbedWindow {
2236 return browser_->is_type_tabbed(); 2237 return browser_->is_type_tabbed();
2237 } 2238 }
2238 2239
2239 @end // @implementation BrowserWindowController(WindowType) 2240 @end // @implementation BrowserWindowController(WindowType)
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_cocoa.mm ('k') | chrome/browser/ui/cocoa/certificate_viewer_mac_browsertest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698