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 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
332 virtual ~ShellWindow(); | 332 virtual ~ShellWindow(); |
333 | 333 |
334 private: | 334 private: |
335 // PlatformAppBrowserTest needs access to web_contents() | 335 // PlatformAppBrowserTest needs access to web_contents() |
336 friend class extensions::PlatformAppBrowserTest; | 336 friend class extensions::PlatformAppBrowserTest; |
337 | 337 |
338 // content::WebContentsDelegate implementation. | 338 // content::WebContentsDelegate implementation. |
339 virtual void CloseContents(content::WebContents* contents) OVERRIDE; | 339 virtual void CloseContents(content::WebContents* contents) OVERRIDE; |
340 virtual bool ShouldSuppressDialogs() OVERRIDE; | 340 virtual bool ShouldSuppressDialogs() OVERRIDE; |
341 virtual content::ColorChooser* OpenColorChooser( | 341 virtual content::ColorChooser* OpenColorChooser( |
342 content::WebContents* web_contents, SkColor color) OVERRIDE; | 342 content::WebContents* web_contents, |
| 343 SkColor color, |
| 344 const std::vector<content::ColorSuggestion>& suggestions) OVERRIDE; |
343 virtual void RunFileChooser( | 345 virtual void RunFileChooser( |
344 content::WebContents* tab, | 346 content::WebContents* tab, |
345 const content::FileChooserParams& params) OVERRIDE; | 347 const content::FileChooserParams& params) OVERRIDE; |
346 virtual bool IsPopupOrPanel( | 348 virtual bool IsPopupOrPanel( |
347 const content::WebContents* source) const OVERRIDE; | 349 const content::WebContents* source) const OVERRIDE; |
348 virtual void MoveContents( | 350 virtual void MoveContents( |
349 content::WebContents* source, const gfx::Rect& pos) OVERRIDE; | 351 content::WebContents* source, const gfx::Rect& pos) OVERRIDE; |
350 virtual void NavigationStateChanged(const content::WebContents* source, | 352 virtual void NavigationStateChanged(const content::WebContents* source, |
351 unsigned changed_flags) OVERRIDE; | 353 unsigned changed_flags) OVERRIDE; |
352 virtual void ToggleFullscreenModeForTab(content::WebContents* source, | 354 virtual void ToggleFullscreenModeForTab(content::WebContents* source, |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
477 | 479 |
478 // Whether the delayed Show() call was for an active or inactive window. | 480 // Whether the delayed Show() call was for an active or inactive window. |
479 ShowType delayed_show_type_; | 481 ShowType delayed_show_type_; |
480 | 482 |
481 DISALLOW_COPY_AND_ASSIGN(ShellWindow); | 483 DISALLOW_COPY_AND_ASSIGN(ShellWindow); |
482 }; | 484 }; |
483 | 485 |
484 } // namespace apps | 486 } // namespace apps |
485 | 487 |
486 #endif // APPS_SHELL_WINDOW_H_ | 488 #endif // APPS_SHELL_WINDOW_H_ |
OLD | NEW |