| 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_BROWSER_H_ | 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_ |
| 6 #define CHROME_BROWSER_UI_BROWSER_H_ | 6 #define CHROME_BROWSER_UI_BROWSER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 434 // Overridden from content::WebContentsDelegate: | 434 // Overridden from content::WebContentsDelegate: |
| 435 virtual bool CanOverscrollContent() const override; | 435 virtual bool CanOverscrollContent() const override; |
| 436 virtual bool ShouldPreserveAbortedURLs(content::WebContents* source) override; | 436 virtual bool ShouldPreserveAbortedURLs(content::WebContents* source) override; |
| 437 virtual bool PreHandleKeyboardEvent( | 437 virtual bool PreHandleKeyboardEvent( |
| 438 content::WebContents* source, | 438 content::WebContents* source, |
| 439 const content::NativeWebKeyboardEvent& event, | 439 const content::NativeWebKeyboardEvent& event, |
| 440 bool* is_keyboard_shortcut) override; | 440 bool* is_keyboard_shortcut) override; |
| 441 virtual void HandleKeyboardEvent( | 441 virtual void HandleKeyboardEvent( |
| 442 content::WebContents* source, | 442 content::WebContents* source, |
| 443 const content::NativeWebKeyboardEvent& event) override; | 443 const content::NativeWebKeyboardEvent& event) override; |
| 444 virtual void OverscrollUpdate(int delta_y) override; | 444 virtual void OverscrollUpdate(float delta_y) override; |
| 445 virtual void ShowValidationMessage(content::WebContents* web_contents, | 445 virtual void ShowValidationMessage(content::WebContents* web_contents, |
| 446 const gfx::Rect& anchor_in_root_view, | 446 const gfx::Rect& anchor_in_root_view, |
| 447 const base::string16& main_text, | 447 const base::string16& main_text, |
| 448 const base::string16& sub_text) override; | 448 const base::string16& sub_text) override; |
| 449 virtual void HideValidationMessage( | 449 virtual void HideValidationMessage( |
| 450 content::WebContents* web_contents) override; | 450 content::WebContents* web_contents) override; |
| 451 virtual void MoveValidationMessage( | 451 virtual void MoveValidationMessage( |
| 452 content::WebContents* web_contents, | 452 content::WebContents* web_contents, |
| 453 const gfx::Rect& anchor_in_root_view) override; | 453 const gfx::Rect& anchor_in_root_view) override; |
| 454 virtual bool PreHandleGestureEvent( | 454 virtual bool PreHandleGestureEvent( |
| (...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 979 // The following factory is used for chrome update coalescing. | 979 // The following factory is used for chrome update coalescing. |
| 980 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 980 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 981 | 981 |
| 982 // The following factory is used to close the frame at a later time. | 982 // The following factory is used to close the frame at a later time. |
| 983 base::WeakPtrFactory<Browser> weak_factory_; | 983 base::WeakPtrFactory<Browser> weak_factory_; |
| 984 | 984 |
| 985 DISALLOW_COPY_AND_ASSIGN(Browser); | 985 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 986 }; | 986 }; |
| 987 | 987 |
| 988 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 988 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |