| 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_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 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 void ConfirmBrowserCloseWithPendingDownloads( | 344 void ConfirmBrowserCloseWithPendingDownloads( |
| 345 int download_count, | 345 int download_count, |
| 346 Browser::DownloadClosePreventionType dialog_type, | 346 Browser::DownloadClosePreventionType dialog_type, |
| 347 bool app_modal, | 347 bool app_modal, |
| 348 const base::Callback<void(bool)>& callback) override; | 348 const base::Callback<void(bool)>& callback) override; |
| 349 void UserChangedTheme() override; | 349 void UserChangedTheme() override; |
| 350 void ShowWebsiteSettings( | 350 void ShowWebsiteSettings( |
| 351 Profile* profile, | 351 Profile* profile, |
| 352 content::WebContents* web_contents, | 352 content::WebContents* web_contents, |
| 353 const GURL& url, | 353 const GURL& url, |
| 354 const SecurityStateModel::SecurityInfo& security_info) override; | 354 const security_state::SecurityStateModel::SecurityInfo& security_info) |
| 355 override; |
| 355 void ShowAppMenu() override; | 356 void ShowAppMenu() override; |
| 356 bool PreHandleKeyboardEvent(const content::NativeWebKeyboardEvent& event, | 357 bool PreHandleKeyboardEvent(const content::NativeWebKeyboardEvent& event, |
| 357 bool* is_keyboard_shortcut) override; | 358 bool* is_keyboard_shortcut) override; |
| 358 void HandleKeyboardEvent( | 359 void HandleKeyboardEvent( |
| 359 const content::NativeWebKeyboardEvent& event) override; | 360 const content::NativeWebKeyboardEvent& event) override; |
| 360 void CutCopyPaste(int command_id) override; | 361 void CutCopyPaste(int command_id) override; |
| 361 WindowOpenDisposition GetDispositionForPopupBounds( | 362 WindowOpenDisposition GetDispositionForPopupBounds( |
| 362 const gfx::Rect& bounds) override; | 363 const gfx::Rect& bounds) override; |
| 363 FindBar* CreateFindBar() override; | 364 FindBar* CreateFindBar() override; |
| 364 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() | 365 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() |
| (...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 712 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; | 713 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; |
| 713 | 714 |
| 714 SigninViewController signin_view_controller_; | 715 SigninViewController signin_view_controller_; |
| 715 | 716 |
| 716 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 717 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 717 | 718 |
| 718 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 719 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 719 }; | 720 }; |
| 720 | 721 |
| 721 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 722 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |