| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 APPS_SHELL_WINDOW_H_ | 5 #ifndef APPS_SHELL_WINDOW_H_ |
| 6 #define APPS_SHELL_WINDOW_H_ | 6 #define APPS_SHELL_WINDOW_H_ |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 10 #include "chrome/browser/extensions/extension_icon_image.h" | 10 #include "chrome/browser/extensions/extension_icon_image.h" |
| (...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 359 const content::MediaResponseCallback& callback) OVERRIDE; | 359 const content::MediaResponseCallback& callback) OVERRIDE; |
| 360 virtual content::WebContents* OpenURLFromTab( | 360 virtual content::WebContents* OpenURLFromTab( |
| 361 content::WebContents* source, | 361 content::WebContents* source, |
| 362 const content::OpenURLParams& params) OVERRIDE; | 362 const content::OpenURLParams& params) OVERRIDE; |
| 363 virtual void AddNewContents(content::WebContents* source, | 363 virtual void AddNewContents(content::WebContents* source, |
| 364 content::WebContents* new_contents, | 364 content::WebContents* new_contents, |
| 365 WindowOpenDisposition disposition, | 365 WindowOpenDisposition disposition, |
| 366 const gfx::Rect& initial_pos, | 366 const gfx::Rect& initial_pos, |
| 367 bool user_gesture, | 367 bool user_gesture, |
| 368 bool* was_blocked) OVERRIDE; | 368 bool* was_blocked) OVERRIDE; |
| 369 virtual bool PreHandleKeyboardEvent( | |
| 370 content::WebContents* source, | |
| 371 const content::NativeWebKeyboardEvent& event, | |
| 372 bool* is_keyboard_shortcut) OVERRIDE; | |
| 373 virtual void HandleKeyboardEvent( | 369 virtual void HandleKeyboardEvent( |
| 374 content::WebContents* source, | 370 content::WebContents* source, |
| 375 const content::NativeWebKeyboardEvent& event) OVERRIDE; | 371 const content::NativeWebKeyboardEvent& event) OVERRIDE; |
| 376 virtual void RequestToLockMouse(content::WebContents* web_contents, | 372 virtual void RequestToLockMouse(content::WebContents* web_contents, |
| 377 bool user_gesture, | 373 bool user_gesture, |
| 378 bool last_unlocked_by_target) OVERRIDE; | 374 bool last_unlocked_by_target) OVERRIDE; |
| 379 | 375 |
| 380 // content::WebContentsObserver implementation. | 376 // content::WebContentsObserver implementation. |
| 381 virtual void DidFirstVisuallyNonEmptyPaint(int32 page_id) OVERRIDE; | 377 virtual void DidFirstVisuallyNonEmptyPaint(int32 page_id) OVERRIDE; |
| 382 | 378 |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 481 | 477 |
| 482 // Whether the delayed Show() call was for an active or inactive window. | 478 // Whether the delayed Show() call was for an active or inactive window. |
| 483 ShowType delayed_show_type_; | 479 ShowType delayed_show_type_; |
| 484 | 480 |
| 485 DISALLOW_COPY_AND_ASSIGN(ShellWindow); | 481 DISALLOW_COPY_AND_ASSIGN(ShellWindow); |
| 486 }; | 482 }; |
| 487 | 483 |
| 488 } // namespace apps | 484 } // namespace apps |
| 489 | 485 |
| 490 #endif // APPS_SHELL_WINDOW_H_ | 486 #endif // APPS_SHELL_WINDOW_H_ |
| OLD | NEW |