summaryrefslogtreecommitdiffstats
path: root/ash/shell_factory.h
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-08 04:52:25 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-08 04:52:25 +0000
commit054b2d765286cc67de69ed85a10cc74d59dd5aa6 (patch)
tree1325b3da3075d9f357ceb371adb0c2466784c06b /ash/shell_factory.h
parentfc76114f1758fb679f99f6a303897a11f3715d87 (diff)
downloadchromium_src-054b2d765286cc67de69ed85a10cc74d59dd5aa6.zip
chromium_src-054b2d765286cc67de69ed85a10cc74d59dd5aa6.tar.gz
chromium_src-054b2d765286cc67de69ed85a10cc74d59dd5aa6.tar.bz2
Add UIControlsAsh that works with multiple root windows
I'll add test for this when I add multiple root window support, which should be soon. BUG=123160 TEST=none Review URL: https://chromiumcodereview.appspot.com/10545058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_factory.h')
-rw-r--r--ash/shell_factory.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/ash/shell_factory.h b/ash/shell_factory.h
index f18c57a..59b20a9 100644
--- a/ash/shell_factory.h
+++ b/ash/shell_factory.h
@@ -17,6 +17,10 @@ namespace gfx {
class ImageSkia;
}
+namespace ui_controls {
+class UIControlsAura;
+}
+
namespace views {
class View;
class Widget;
@@ -30,7 +34,10 @@ namespace internal {
void CreateDesktopBackground(const gfx::ImageSkia& wallpaper,
WallpaperLayout wallpaper_layout,
aura::RootWindow* root_window);
+
ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents);
+
+ui_controls::UIControlsAura* CreateUIControls();
} // namespace internal
} // namespace ash