summaryrefslogtreecommitdiffstats
path: root/ash/shell
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-25 02:37:43 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-25 02:37:43 +0000
commit01c5bab79816fb9b5506a00def35a68210671584 (patch)
treeb0e66951edc2de30ec4213b545a39bf998aa151a /ash/shell
parentb5825ee9b669514d336ef4790eb659ec351e359a (diff)
downloadchromium_src-01c5bab79816fb9b5506a00def35a68210671584.zip
chromium_src-01c5bab79816fb9b5506a00def35a68210671584.tar.gz
chromium_src-01c5bab79816fb9b5506a00def35a68210671584.tar.bz2
Remove RootWindow::Run(). This removes one reason people will call RootWindow::GetInstance().
http://crbug.com/112131 TEST=none Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=123593 Review URL: http://codereview.chromium.org/9466029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123629 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
-rw-r--r--ash/shell/shell_main.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/shell/shell_main.cc b/ash/shell/shell_main.cc
index 9d34bdf..6e89f9b 100644
--- a/ash/shell/shell_main.cc
+++ b/ash/shell/shell_main.cc
@@ -251,7 +251,8 @@ int main(int argc, char** argv) {
ash::shell::InitWindowTypeLauncher();
- ash::Shell::GetRootWindow()->Run();
+ ash::Shell::GetRootWindow()->ShowRootWindow();
+ MessageLoopForUI::current()->Run();
window_watcher.reset();