| OLD | NEW |
| 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 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/desktop_background/desktop_background_resources.h" | 9 #include "ash/desktop_background/desktop_background_resources.h" |
| 10 | 10 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 namespace views { | 23 namespace views { |
| 24 class View; | 24 class View; |
| 25 class Widget; | 25 class Widget; |
| 26 } | 26 } |
| 27 | 27 |
| 28 // Declarations of shell component factory functions. | 28 // Declarations of shell component factory functions. |
| 29 | 29 |
| 30 namespace ash { | 30 namespace ash { |
| 31 | 31 |
| 32 namespace internal { | 32 namespace internal { |
| 33 void CreateDesktopBackground(aura::RootWindow* root_window); | 33 void CreateDesktopBackground(aura::RootWindow* root_window, int container_id); |
| 34 | 34 |
| 35 ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents); | 35 ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents); |
| 36 | 36 |
| 37 ui_controls::UIControlsAura* CreateUIControls(); | 37 ui_controls::UIControlsAura* CreateUIControls(); |
| 38 } // namespace internal | 38 } // namespace internal |
| 39 | 39 |
| 40 } // namespace ash | 40 } // namespace ash |
| 41 | 41 |
| 42 | 42 |
| 43 #endif // ASH_SHELL_FACTORY_H_ | 43 #endif // ASH_SHELL_FACTORY_H_ |
| OLD | NEW |