| 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 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 const content::MediaResponseCallback& callback) OVERRIDE; | 341 const content::MediaResponseCallback& callback) OVERRIDE; |
| 342 virtual content::WebContents* OpenURLFromTab( | 342 virtual content::WebContents* OpenURLFromTab( |
| 343 content::WebContents* source, | 343 content::WebContents* source, |
| 344 const content::OpenURLParams& params) OVERRIDE; | 344 const content::OpenURLParams& params) OVERRIDE; |
| 345 virtual void AddNewContents(content::WebContents* source, | 345 virtual void AddNewContents(content::WebContents* source, |
| 346 content::WebContents* new_contents, | 346 content::WebContents* new_contents, |
| 347 WindowOpenDisposition disposition, | 347 WindowOpenDisposition disposition, |
| 348 const gfx::Rect& initial_pos, | 348 const gfx::Rect& initial_pos, |
| 349 bool user_gesture, | 349 bool user_gesture, |
| 350 bool* was_blocked) OVERRIDE; | 350 bool* was_blocked) OVERRIDE; |
| 351 virtual bool PreHandleKeyboardEvent( |
| 352 content::WebContents* source, |
| 353 const content::NativeWebKeyboardEvent& event, |
| 354 bool* is_keyboard_shortcut) OVERRIDE; |
| 351 virtual void HandleKeyboardEvent( | 355 virtual void HandleKeyboardEvent( |
| 352 content::WebContents* source, | 356 content::WebContents* source, |
| 353 const content::NativeWebKeyboardEvent& event) OVERRIDE; | 357 const content::NativeWebKeyboardEvent& event) OVERRIDE; |
| 354 virtual void RequestToLockMouse(content::WebContents* web_contents, | 358 virtual void RequestToLockMouse(content::WebContents* web_contents, |
| 355 bool user_gesture, | 359 bool user_gesture, |
| 356 bool last_unlocked_by_target) OVERRIDE; | 360 bool last_unlocked_by_target) OVERRIDE; |
| 357 | 361 |
| 358 // content::WebContentsObserver implementation. | 362 // content::WebContentsObserver implementation. |
| 359 virtual void DidFirstVisuallyNonEmptyPaint(int32 page_id) OVERRIDE; | 363 virtual void DidFirstVisuallyNonEmptyPaint(int32 page_id) OVERRIDE; |
| 360 | 364 |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 461 | 465 |
| 462 // Whether the delayed Show() call was for an active or inactive window. | 466 // Whether the delayed Show() call was for an active or inactive window. |
| 463 ShowType delayed_show_type_; | 467 ShowType delayed_show_type_; |
| 464 | 468 |
| 465 DISALLOW_COPY_AND_ASSIGN(ShellWindow); | 469 DISALLOW_COPY_AND_ASSIGN(ShellWindow); |
| 466 }; | 470 }; |
| 467 | 471 |
| 468 } // namespace apps | 472 } // namespace apps |
| 469 | 473 |
| 470 #endif // APPS_SHELL_WINDOW_H_ | 474 #endif // APPS_SHELL_WINDOW_H_ |
| OLD | NEW |