| 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 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 436 | 436 |
| 437 // Overridden from content::WebContentsDelegate: | 437 // Overridden from content::WebContentsDelegate: |
| 438 bool CanOverscrollContent() const override; | 438 bool CanOverscrollContent() const override; |
| 439 bool ShouldPreserveAbortedURLs(content::WebContents* source) override; | 439 bool ShouldPreserveAbortedURLs(content::WebContents* source) override; |
| 440 bool PreHandleKeyboardEvent(content::WebContents* source, | 440 bool PreHandleKeyboardEvent(content::WebContents* source, |
| 441 const content::NativeWebKeyboardEvent& event, | 441 const content::NativeWebKeyboardEvent& event, |
| 442 bool* is_keyboard_shortcut) override; | 442 bool* is_keyboard_shortcut) override; |
| 443 void HandleKeyboardEvent( | 443 void HandleKeyboardEvent( |
| 444 content::WebContents* source, | 444 content::WebContents* source, |
| 445 const content::NativeWebKeyboardEvent& event) override; | 445 const content::NativeWebKeyboardEvent& event) override; |
| 446 void OverscrollUpdate(float delta_y) override; | |
| 447 void ShowValidationMessage(content::WebContents* web_contents, | 446 void ShowValidationMessage(content::WebContents* web_contents, |
| 448 const gfx::Rect& anchor_in_root_view, | 447 const gfx::Rect& anchor_in_root_view, |
| 449 const base::string16& main_text, | 448 const base::string16& main_text, |
| 450 const base::string16& sub_text) override; | 449 const base::string16& sub_text) override; |
| 451 void HideValidationMessage(content::WebContents* web_contents) override; | 450 void HideValidationMessage(content::WebContents* web_contents) override; |
| 452 void MoveValidationMessage(content::WebContents* web_contents, | 451 void MoveValidationMessage(content::WebContents* web_contents, |
| 453 const gfx::Rect& anchor_in_root_view) override; | 452 const gfx::Rect& anchor_in_root_view) override; |
| 454 bool PreHandleGestureEvent(content::WebContents* source, | 453 bool PreHandleGestureEvent(content::WebContents* source, |
| 455 const blink::WebGestureEvent& event) override; | 454 const blink::WebGestureEvent& event) override; |
| 456 bool CanDragEnter(content::WebContents* source, | 455 bool CanDragEnter(content::WebContents* source, |
| (...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 962 | 961 |
| 963 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; | 962 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; |
| 964 | 963 |
| 965 // The following factory is used to close the frame at a later time. | 964 // The following factory is used to close the frame at a later time. |
| 966 base::WeakPtrFactory<Browser> weak_factory_; | 965 base::WeakPtrFactory<Browser> weak_factory_; |
| 967 | 966 |
| 968 DISALLOW_COPY_AND_ASSIGN(Browser); | 967 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 969 }; | 968 }; |
| 970 | 969 |
| 971 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 970 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |