diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-06 19:35:45 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-06 19:35:45 +0000 |
| commit | b3b7bcd98b927b85015340ebef1dd9ac112006bf (patch) | |
| tree | d1c3d8ef8650b52aca7da928cd1d5e113653a0cc /ash | |
| parent | 85f1ee1d545b7d7874969ea5fe7e63fef7d2b0c5 (diff) | |
| download | chromium_src-b3b7bcd98b927b85015340ebef1dd9ac112006bf.zip chromium_src-b3b7bcd98b927b85015340ebef1dd9ac112006bf.tar.gz chromium_src-b3b7bcd98b927b85015340ebef1dd9ac112006bf.tar.bz2 | |
Reland - Show applications page in aura compact mode."
BUG=116852
TEST=Launch chromeos aura in compact mode and observe that you can access applications on the new tab page.
Review URL: https://chromiumcodereview.appspot.com/9616011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shell.cc | 5 | ||||
| -rw-r--r-- | ash/shell.h | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 32f7897..1041a3d 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -352,6 +352,11 @@ Shell* Shell::GetInstance() { } // static +bool Shell::HasInstance() { + return !!instance_; +} + +// static void Shell::DeleteInstance() { delete instance_; instance_ = NULL; diff --git a/ash/shell.h b/ash/shell.h index fd66891..239df7d 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -117,6 +117,9 @@ class ASH_EXPORT Shell { // Should never be called before |CreateInstance()|. static Shell* GetInstance(); + // Returns true if the ash shell has been instantiated. + static bool HasInstance(); + static void DeleteInstance(); // Get the singleton RootWindow used by the Shell. |