OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 5 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
7 | 7 |
8 #include "base/mac/scoped_nsobject.h" | 8 #include "base/mac/scoped_nsobject.h" |
9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
10 #include "chrome/browser/extensions/extension_keybinding_registry.h" | 10 #include "chrome/browser/extensions/extension_keybinding_registry.h" |
11 #include "chrome/browser/signin/chrome_signin_helper.h" | 11 #include "chrome/browser/signin/chrome_signin_helper.h" |
| 12 #include "chrome/browser/ssl/security_state_model.h" |
12 #include "chrome/browser/ui/browser_window.h" | 13 #include "chrome/browser/ui/browser_window.h" |
13 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" | 14 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" |
14 #include "chrome/browser/ui/search/search_model_observer.h" | 15 #include "chrome/browser/ui/search/search_model_observer.h" |
15 #include "components/bookmarks/browser/bookmark_model.h" | 16 #include "components/bookmarks/browser/bookmark_model.h" |
16 #include "ui/base/ui_base_types.h" | 17 #include "ui/base/ui_base_types.h" |
17 | 18 |
18 class Browser; | 19 class Browser; |
19 @class BrowserWindowController; | 20 @class BrowserWindowController; |
20 @class FindBarCocoaController; | 21 @class FindBarCocoaController; |
21 @class NSEvent; | 22 @class NSEvent; |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 const StartSyncCallback& start_sync_callback) override; | 130 const StartSyncCallback& start_sync_callback) override; |
130 #endif | 131 #endif |
131 bool IsDownloadShelfVisible() const override; | 132 bool IsDownloadShelfVisible() const override; |
132 DownloadShelf* GetDownloadShelf() override; | 133 DownloadShelf* GetDownloadShelf() override; |
133 void ConfirmBrowserCloseWithPendingDownloads( | 134 void ConfirmBrowserCloseWithPendingDownloads( |
134 int download_count, | 135 int download_count, |
135 Browser::DownloadClosePreventionType dialog_type, | 136 Browser::DownloadClosePreventionType dialog_type, |
136 bool app_modal, | 137 bool app_modal, |
137 const base::Callback<void(bool)>& callback) override; | 138 const base::Callback<void(bool)>& callback) override; |
138 void UserChangedTheme() override; | 139 void UserChangedTheme() override; |
139 void ShowWebsiteSettings(Profile* profile, | 140 void ShowWebsiteSettings( |
140 content::WebContents* web_contents, | 141 Profile* profile, |
141 const GURL& url, | 142 content::WebContents* web_contents, |
142 const content::SSLStatus& ssl) override; | 143 const GURL& url, |
| 144 const SecurityStateModel::SecurityInfo& security_info) override; |
143 void ShowAppMenu() override; | 145 void ShowAppMenu() override; |
144 bool PreHandleKeyboardEvent(const content::NativeWebKeyboardEvent& event, | 146 bool PreHandleKeyboardEvent(const content::NativeWebKeyboardEvent& event, |
145 bool* is_keyboard_shortcut) override; | 147 bool* is_keyboard_shortcut) override; |
146 void HandleKeyboardEvent( | 148 void HandleKeyboardEvent( |
147 const content::NativeWebKeyboardEvent& event) override; | 149 const content::NativeWebKeyboardEvent& event) override; |
148 void CutCopyPaste(int command_id) override; | 150 void CutCopyPaste(int command_id) override; |
149 WindowOpenDisposition GetDispositionForPopupBounds( | 151 WindowOpenDisposition GetDispositionForPopupBounds( |
150 const gfx::Rect& bounds) override; | 152 const gfx::Rect& bounds) override; |
151 FindBar* CreateFindBar() override; | 153 FindBar* CreateFindBar() override; |
152 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() | 154 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
186 NSWindow* window() const; // Accessor for the (current) |NSWindow|. | 188 NSWindow* window() const; // Accessor for the (current) |NSWindow|. |
187 | 189 |
188 Browser* browser_; // weak, owned by controller | 190 Browser* browser_; // weak, owned by controller |
189 BrowserWindowController* controller_; // weak, owns us | 191 BrowserWindowController* controller_; // weak, owns us |
190 base::scoped_nsobject<NSString> pending_window_title_; | 192 base::scoped_nsobject<NSString> pending_window_title_; |
191 ui::WindowShowState initial_show_state_; | 193 ui::WindowShowState initial_show_state_; |
192 NSInteger attention_request_id_; // identifier from requestUserAttention | 194 NSInteger attention_request_id_; // identifier from requestUserAttention |
193 }; | 195 }; |
194 | 196 |
195 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 197 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
OLD | NEW |