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

Side by Side Diff: ash/shell_factory.h

Issue 10184012: Revert 133468 - Fix wallpaper fade animation flashing problem. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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
« no previous file with comments | « ash/desktop_background/desktop_background_view.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 ASH_SHELL_FACTORY_H_ 5 #ifndef ASH_SHELL_FACTORY_H_
6 #define ASH_SHELL_FACTORY_H_ 6 #define ASH_SHELL_FACTORY_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ash/ash_export.h" 9 #include "ash/ash_export.h"
10 #include "ash/desktop_background/desktop_background_resources.h" 10 #include "ash/desktop_background/desktop_background_resources.h"
11 11
12 class SkBitmap; 12 class SkBitmap;
13 13
14 namespace views { 14 namespace views {
15 class View; 15 class View;
16 class Widget; 16 class Widget;
17 } 17 }
18 18
19 // Declarations of shell component factory functions. 19 // Declarations of shell component factory functions.
20 20
21 namespace ash { 21 namespace ash {
22 22
23 namespace internal { 23 namespace internal {
24 void CreateDesktopBackground(const SkBitmap& wallpaper, ImageLayout layout); 24 views::Widget* CreateDesktopBackground(const SkBitmap& wallpaper,
25 ImageLayout layout);
25 ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents); 26 ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents);
26 } // namespace internal 27 } // namespace internal
27 28
28 } // namespace ash 29 } // namespace ash
29 30
30 31
31 #endif // ASH_SHELL_FACTORY_H_ 32 #endif // ASH_SHELL_FACTORY_H_
OLDNEW
« no previous file with comments | « ash/desktop_background/desktop_background_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698