diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-25 00:06:31 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-25 00:06:31 +0000 |
| commit | bd7b0ba5f588b3983ae25265d8ebef74e57aece9 (patch) | |
| tree | 86845849f02e3129a63c2514cfd8ad0c8f3b8767 /ash/shell | |
| parent | ffb46c2b259a1f7d72010c2e81d88eb3370bcfbe (diff) | |
| download | chromium_src-bd7b0ba5f588b3983ae25265d8ebef74e57aece9.zip chromium_src-bd7b0ba5f588b3983ae25265d8ebef74e57aece9.tar.gz chromium_src-bd7b0ba5f588b3983ae25265d8ebef74e57aece9.tar.bz2 | |
Revert 123593 - Remove RootWindow::Run(). This removes one reason people will call RootWindow::GetInstance().
http://crbug.com/112131
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9466029
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9447080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123594 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/shell_main.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ash/shell/shell_main.cc b/ash/shell/shell_main.cc index 6e89f9b..9d34bdf 100644 --- a/ash/shell/shell_main.cc +++ b/ash/shell/shell_main.cc @@ -251,8 +251,7 @@ int main(int argc, char** argv) { ash::shell::InitWindowTypeLauncher(); - ash::Shell::GetRootWindow()->ShowRootWindow(); - MessageLoopForUI::current()->Run(); + ash::Shell::GetRootWindow()->Run(); window_watcher.reset(); |