summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/aura/demo/demo_main.cc3
-rw-r--r--ui/aura/root_window.cc5
-rw-r--r--ui/aura/root_window.h3
3 files changed, 2 insertions, 9 deletions
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index 2882032..48f2e8d 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -115,7 +115,8 @@ int main(int argc, char** argv) {
window3.Show();
window3.SetParent(&window2);
- aura::RootWindow::GetInstance()->Run();
+ aura::RootWindow::GetInstance()->ShowRootWindow();
+ MessageLoopForUI::current()->Run();
ui::CompositorTestSupport::Terminate();
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index 2e110a7..36ee2cd 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -138,11 +138,6 @@ bool RootWindow::ConfineCursorToWindow() {
return host_->ConfineCursorToRootWindow();
}
-void RootWindow::Run() {
- ShowRootWindow();
- MessageLoopForUI::current()->Run();
-}
-
void RootWindow::Draw() {
if (waiting_on_compositing_end_) {
draw_on_compositing_end_ = true;
diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h
index 1f999aa..d28a22f 100644
--- a/ui/aura/root_window.h
+++ b/ui/aura/root_window.h
@@ -99,9 +99,6 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
// using this function. Returns true if successful.
bool ConfineCursorToWindow();
- // Shows the root window host and runs an event loop for it.
- void Run();
-
// Draws the necessary set of windows.
void Draw();