summaryrefslogtreecommitdiffstats
path: root/ash/shell_factory.h
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-04 19:00:40 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-04 19:00:40 +0000
commit1dcddaeeb80a9c0ff04a315b209ca314d9f2cffe (patch)
tree209a3e640b129dd20483f0378d0152898a3ab5bb /ash/shell_factory.h
parentc5968bff6f0c89c9968a7aee3924d71263ccf844 (diff)
downloadchromium_src-1dcddaeeb80a9c0ff04a315b209ca314d9f2cffe.zip
chromium_src-1dcddaeeb80a9c0ff04a315b209ca314d9f2cffe.tar.gz
chromium_src-1dcddaeeb80a9c0ff04a315b209ca314d9f2cffe.tar.bz2
ash uber tray: Make it work in ash_shell, and a couple more fixes.
The fixes: (1) make sure the popup shows up in login screen, (2) align the popup to the edge of the screen. BUG=110130 TEST=none Review URL: https://chromiumcodereview.appspot.com/9596002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124903 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_factory.h')
-rw-r--r--ash/shell_factory.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/shell_factory.h b/ash/shell_factory.h
index 4b88f3e..0faec35 100644
--- a/ash/shell_factory.h
+++ b/ash/shell_factory.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -9,6 +9,7 @@
#include "ash/ash_export.h"
namespace views {
+class View;
class Widget;
}
@@ -18,7 +19,7 @@ namespace ash {
namespace internal {
views::Widget* CreateDesktopBackground();
-ASH_EXPORT views::Widget* CreateStatusArea();
+ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents);
} // namespace internal
} // namespace ash