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 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 virtual ~ShellWindow(); | 314 virtual ~ShellWindow(); |
315 | 315 |
316 private: | 316 private: |
317 // PlatformAppBrowserTest needs access to web_contents() | 317 // PlatformAppBrowserTest needs access to web_contents() |
318 friend class extensions::PlatformAppBrowserTest; | 318 friend class extensions::PlatformAppBrowserTest; |
319 | 319 |
320 // content::WebContentsDelegate implementation. | 320 // content::WebContentsDelegate implementation. |
321 virtual void CloseContents(content::WebContents* contents) OVERRIDE; | 321 virtual void CloseContents(content::WebContents* contents) OVERRIDE; |
322 virtual bool ShouldSuppressDialogs() OVERRIDE; | 322 virtual bool ShouldSuppressDialogs() OVERRIDE; |
323 virtual content::ColorChooser* OpenColorChooser( | 323 virtual content::ColorChooser* OpenColorChooser( |
324 content::WebContents* web_contents, SkColor color) OVERRIDE; | 324 content::WebContents* web_contents, |
| 325 SkColor color, |
| 326 const std::vector<SkColor>& suggestions, |
| 327 const std::vector<string16>& suggestion_labels) OVERRIDE; |
325 virtual void RunFileChooser( | 328 virtual void RunFileChooser( |
326 content::WebContents* tab, | 329 content::WebContents* tab, |
327 const content::FileChooserParams& params) OVERRIDE; | 330 const content::FileChooserParams& params) OVERRIDE; |
328 virtual bool IsPopupOrPanel( | 331 virtual bool IsPopupOrPanel( |
329 const content::WebContents* source) const OVERRIDE; | 332 const content::WebContents* source) const OVERRIDE; |
330 virtual void MoveContents( | 333 virtual void MoveContents( |
331 content::WebContents* source, const gfx::Rect& pos) OVERRIDE; | 334 content::WebContents* source, const gfx::Rect& pos) OVERRIDE; |
332 virtual void NavigationStateChanged(const content::WebContents* source, | 335 virtual void NavigationStateChanged(const content::WebContents* source, |
333 unsigned changed_flags) OVERRIDE; | 336 unsigned changed_flags) OVERRIDE; |
334 virtual void ToggleFullscreenModeForTab(content::WebContents* source, | 337 virtual void ToggleFullscreenModeForTab(content::WebContents* source, |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
461 | 464 |
462 // Whether the delayed Show() call was for an active or inactive window. | 465 // Whether the delayed Show() call was for an active or inactive window. |
463 ShowType delayed_show_type_; | 466 ShowType delayed_show_type_; |
464 | 467 |
465 DISALLOW_COPY_AND_ASSIGN(ShellWindow); | 468 DISALLOW_COPY_AND_ASSIGN(ShellWindow); |
466 }; | 469 }; |
467 | 470 |
468 } // namespace apps | 471 } // namespace apps |
469 | 472 |
470 #endif // APPS_SHELL_WINDOW_H_ | 473 #endif // APPS_SHELL_WINDOW_H_ |
OLD | NEW |