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

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

Issue 1539043002: Pull SecurityStateModel out into a component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 11 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
« no previous file with comments | « chrome/browser/ui/browser_window.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
13 #include "chrome/browser/ui/browser_window.h" 12 #include "chrome/browser/ui/browser_window.h"
14 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" 13 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
15 #include "chrome/browser/ui/search/search_model_observer.h" 14 #include "chrome/browser/ui/search/search_model_observer.h"
16 #include "chrome/browser/ui/tabs/tab_utils.h" 15 #include "chrome/browser/ui/tabs/tab_utils.h"
17 #include "components/bookmarks/browser/bookmark_model.h" 16 #include "components/bookmarks/browser/bookmark_model.h"
17 #include "components/security_state/security_state_model.h"
18 #include "ui/base/ui_base_types.h" 18 #include "ui/base/ui_base_types.h"
19 19
20 class Browser; 20 class Browser;
21 @class BrowserWindowController; 21 @class BrowserWindowController;
22 @class FindBarCocoaController; 22 @class FindBarCocoaController;
23 @class NSEvent; 23 @class NSEvent;
24 @class NSMenu; 24 @class NSMenu;
25 @class NSWindow; 25 @class NSWindow;
26 26
27 namespace extensions { 27 namespace extensions {
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 void ConfirmBrowserCloseWithPendingDownloads( 138 void ConfirmBrowserCloseWithPendingDownloads(
139 int download_count, 139 int download_count,
140 Browser::DownloadClosePreventionType dialog_type, 140 Browser::DownloadClosePreventionType dialog_type,
141 bool app_modal, 141 bool app_modal,
142 const base::Callback<void(bool)>& callback) override; 142 const base::Callback<void(bool)>& callback) override;
143 void UserChangedTheme() override; 143 void UserChangedTheme() override;
144 void ShowWebsiteSettings( 144 void ShowWebsiteSettings(
145 Profile* profile, 145 Profile* profile,
146 content::WebContents* web_contents, 146 content::WebContents* web_contents,
147 const GURL& url, 147 const GURL& url,
148 const SecurityStateModel::SecurityInfo& security_info) override; 148 const security_state::SecurityStateModel::SecurityInfo& security_info)
149 override;
149 void ShowAppMenu() override; 150 void ShowAppMenu() override;
150 bool PreHandleKeyboardEvent(const content::NativeWebKeyboardEvent& event, 151 bool PreHandleKeyboardEvent(const content::NativeWebKeyboardEvent& event,
151 bool* is_keyboard_shortcut) override; 152 bool* is_keyboard_shortcut) override;
152 void HandleKeyboardEvent( 153 void HandleKeyboardEvent(
153 const content::NativeWebKeyboardEvent& event) override; 154 const content::NativeWebKeyboardEvent& event) override;
154 void CutCopyPaste(int command_id) override; 155 void CutCopyPaste(int command_id) override;
155 WindowOpenDisposition GetDispositionForPopupBounds( 156 WindowOpenDisposition GetDispositionForPopupBounds(
156 const gfx::Rect& bounds) override; 157 const gfx::Rect& bounds) override;
157 FindBar* CreateFindBar() override; 158 FindBar* CreateFindBar() override;
158 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() 159 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost()
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 ui::WindowShowState initial_show_state_; 213 ui::WindowShowState initial_show_state_;
213 NSInteger attention_request_id_; // identifier from requestUserAttention 214 NSInteger attention_request_id_; // identifier from requestUserAttention
214 215
215 // Preserves window media state to show appropriate icon in the window title 216 // Preserves window media state to show appropriate icon in the window title
216 // which can be audio playing, muting or none (determined by media state of 217 // which can be audio playing, muting or none (determined by media state of
217 // tabs. 218 // tabs.
218 TabMediaState media_state_; 219 TabMediaState media_state_;
219 }; 220 };
220 221
221 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 222 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_window.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698