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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 1314953009: Refactor WebsiteSettings to operate on a SecurityInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 3 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 (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_VIEWS_FRAME_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 // TODO(beng): Not an override, move somewhere else. 333 // TODO(beng): Not an override, move somewhere else.
334 void SetDownloadShelfVisible(bool visible); 334 void SetDownloadShelfVisible(bool visible);
335 bool IsDownloadShelfVisible() const override; 335 bool IsDownloadShelfVisible() const override;
336 DownloadShelf* GetDownloadShelf() override; 336 DownloadShelf* GetDownloadShelf() override;
337 void ConfirmBrowserCloseWithPendingDownloads( 337 void ConfirmBrowserCloseWithPendingDownloads(
338 int download_count, 338 int download_count,
339 Browser::DownloadClosePreventionType dialog_type, 339 Browser::DownloadClosePreventionType dialog_type,
340 bool app_modal, 340 bool app_modal,
341 const base::Callback<void(bool)>& callback) override; 341 const base::Callback<void(bool)>& callback) override;
342 void UserChangedTheme() override; 342 void UserChangedTheme() override;
343 void ShowWebsiteSettings(Profile* profile, 343 void ShowWebsiteSettings(
344 content::WebContents* web_contents, 344 Profile* profile,
345 const GURL& url, 345 content::WebContents* web_contents,
346 const content::SSLStatus& ssl) override; 346 const GURL& url,
347 const SecurityStateModel::SecurityInfo& security_info) override;
347 void ShowAppMenu() override; 348 void ShowAppMenu() override;
348 bool PreHandleKeyboardEvent(const content::NativeWebKeyboardEvent& event, 349 bool PreHandleKeyboardEvent(const content::NativeWebKeyboardEvent& event,
349 bool* is_keyboard_shortcut) override; 350 bool* is_keyboard_shortcut) override;
350 void HandleKeyboardEvent( 351 void HandleKeyboardEvent(
351 const content::NativeWebKeyboardEvent& event) override; 352 const content::NativeWebKeyboardEvent& event) override;
352 void CutCopyPaste(int command_id) override; 353 void CutCopyPaste(int command_id) override;
353 WindowOpenDisposition GetDispositionForPopupBounds( 354 WindowOpenDisposition GetDispositionForPopupBounds(
354 const gfx::Rect& bounds) override; 355 const gfx::Rect& bounds) override;
355 FindBar* CreateFindBar() override; 356 FindBar* CreateFindBar() override;
356 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() 357 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost()
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
700 scoped_ptr<ImmersiveModeController> immersive_mode_controller_; 701 scoped_ptr<ImmersiveModeController> immersive_mode_controller_;
701 702
702 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; 703 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_;
703 704
704 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 705 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
705 706
706 DISALLOW_COPY_AND_ASSIGN(BrowserView); 707 DISALLOW_COPY_AND_ASSIGN(BrowserView);
707 }; 708 };
708 709
709 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 710 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698