Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(688)

Side by Side Diff: apps/shell_window.h

Issue 23026006: Add support for color input datalist on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 virtual ~ShellWindow(); 251 virtual ~ShellWindow();
252 252
253 private: 253 private:
254 // PlatformAppBrowserTest needs access to web_contents() 254 // PlatformAppBrowserTest needs access to web_contents()
255 friend class extensions::PlatformAppBrowserTest; 255 friend class extensions::PlatformAppBrowserTest;
256 256
257 // content::WebContentsDelegate implementation. 257 // content::WebContentsDelegate implementation.
258 virtual void CloseContents(content::WebContents* contents) OVERRIDE; 258 virtual void CloseContents(content::WebContents* contents) OVERRIDE;
259 virtual bool ShouldSuppressDialogs() OVERRIDE; 259 virtual bool ShouldSuppressDialogs() OVERRIDE;
260 virtual content::ColorChooser* OpenColorChooser( 260 virtual content::ColorChooser* OpenColorChooser(
261 content::WebContents* web_contents, SkColor color) OVERRIDE; 261 content::WebContents* web_contents,
Miguel Garcia 2013/08/19 14:43:27 same thing about sending color suggestions and lab
keishi 2013/08/26 05:28:54 Done.
262 SkColor color,
263 const std::vector<SkColor>& suggestions,
264 const std::vector<string16>& suggestion_labels) OVERRIDE;
262 virtual void RunFileChooser( 265 virtual void RunFileChooser(
263 content::WebContents* tab, 266 content::WebContents* tab,
264 const content::FileChooserParams& params) OVERRIDE; 267 const content::FileChooserParams& params) OVERRIDE;
265 virtual bool IsPopupOrPanel( 268 virtual bool IsPopupOrPanel(
266 const content::WebContents* source) const OVERRIDE; 269 const content::WebContents* source) const OVERRIDE;
267 virtual void MoveContents( 270 virtual void MoveContents(
268 content::WebContents* source, const gfx::Rect& pos) OVERRIDE; 271 content::WebContents* source, const gfx::Rect& pos) OVERRIDE;
269 virtual void NavigationStateChanged(const content::WebContents* source, 272 virtual void NavigationStateChanged(const content::WebContents* source,
270 unsigned changed_flags) OVERRIDE; 273 unsigned changed_flags) OVERRIDE;
271 virtual void ToggleFullscreenModeForTab(content::WebContents* source, 274 virtual void ToggleFullscreenModeForTab(content::WebContents* source,
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 bool fullscreen_for_window_api_; 377 bool fullscreen_for_window_api_;
375 // Fullscreen entered by HTML requestFullscreen. 378 // Fullscreen entered by HTML requestFullscreen.
376 bool fullscreen_for_tab_; 379 bool fullscreen_for_tab_;
377 380
378 DISALLOW_COPY_AND_ASSIGN(ShellWindow); 381 DISALLOW_COPY_AND_ASSIGN(ShellWindow);
379 }; 382 };
380 383
381 } // namespace apps 384 } // namespace apps
382 385
383 #endif // APPS_SHELL_WINDOW_H_ 386 #endif // APPS_SHELL_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698