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 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
255 virtual ~ShellWindow(); | 255 virtual ~ShellWindow(); |
256 | 256 |
257 private: | 257 private: |
258 // PlatformAppBrowserTest needs access to web_contents() | 258 // PlatformAppBrowserTest needs access to web_contents() |
259 friend class extensions::PlatformAppBrowserTest; | 259 friend class extensions::PlatformAppBrowserTest; |
260 | 260 |
261 // content::WebContentsDelegate implementation. | 261 // content::WebContentsDelegate implementation. |
262 virtual void CloseContents(content::WebContents* contents) OVERRIDE; | 262 virtual void CloseContents(content::WebContents* contents) OVERRIDE; |
263 virtual bool ShouldSuppressDialogs() OVERRIDE; | 263 virtual bool ShouldSuppressDialogs() OVERRIDE; |
264 virtual content::ColorChooser* OpenColorChooser( | 264 virtual content::ColorChooser* OpenColorChooser( |
265 content::WebContents* web_contents, SkColor color) OVERRIDE; | 265 content::WebContents* web_contents, |
| 266 SkColor color, |
| 267 const std::vector<SkColor>& suggestions, |
| 268 const std::vector<string16>& suggestion_labels) OVERRIDE; |
266 virtual void RunFileChooser( | 269 virtual void RunFileChooser( |
267 content::WebContents* tab, | 270 content::WebContents* tab, |
268 const content::FileChooserParams& params) OVERRIDE; | 271 const content::FileChooserParams& params) OVERRIDE; |
269 virtual bool IsPopupOrPanel( | 272 virtual bool IsPopupOrPanel( |
270 const content::WebContents* source) const OVERRIDE; | 273 const content::WebContents* source) const OVERRIDE; |
271 virtual void MoveContents( | 274 virtual void MoveContents( |
272 content::WebContents* source, const gfx::Rect& pos) OVERRIDE; | 275 content::WebContents* source, const gfx::Rect& pos) OVERRIDE; |
273 virtual void NavigationStateChanged(const content::WebContents* source, | 276 virtual void NavigationStateChanged(const content::WebContents* source, |
274 unsigned changed_flags) OVERRIDE; | 277 unsigned changed_flags) OVERRIDE; |
275 virtual void ToggleFullscreenModeForTab(content::WebContents* source, | 278 virtual void ToggleFullscreenModeForTab(content::WebContents* source, |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
378 bool fullscreen_for_window_api_; | 381 bool fullscreen_for_window_api_; |
379 // Fullscreen entered by HTML requestFullscreen. | 382 // Fullscreen entered by HTML requestFullscreen. |
380 bool fullscreen_for_tab_; | 383 bool fullscreen_for_tab_; |
381 | 384 |
382 DISALLOW_COPY_AND_ASSIGN(ShellWindow); | 385 DISALLOW_COPY_AND_ASSIGN(ShellWindow); |
383 }; | 386 }; |
384 | 387 |
385 } // namespace apps | 388 } // namespace apps |
386 | 389 |
387 #endif // APPS_SHELL_WINDOW_H_ | 390 #endif // APPS_SHELL_WINDOW_H_ |
OLD | NEW |