| OLD | NEW | 
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "base/at_exit.h" | 5 #include "base/at_exit.h" | 
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" | 
| 7 #include "base/i18n/icu_util.h" | 7 #include "base/i18n/icu_util.h" | 
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" | 
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" | 
| 10 #include "third_party/skia/include/core/SkXfermode.h" | 10 #include "third_party/skia/include/core/SkXfermode.h" | 
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 80   MessageLoop message_loop(MessageLoop::TYPE_UI); | 80   MessageLoop message_loop(MessageLoop::TYPE_UI); | 
| 81 | 81 | 
| 82   aura::Desktop::GetInstance(); | 82   aura::Desktop::GetInstance(); | 
| 83 | 83 | 
| 84   // Create a hierarchy of test windows. | 84   // Create a hierarchy of test windows. | 
| 85   DemoWindowDelegate window_delegate1(SK_ColorBLUE); | 85   DemoWindowDelegate window_delegate1(SK_ColorBLUE); | 
| 86   aura::Window window1(&window_delegate1); | 86   aura::Window window1(&window_delegate1); | 
| 87   window1.set_id(1); | 87   window1.set_id(1); | 
| 88   window1.Init(); | 88   window1.Init(); | 
| 89   window1.SetBounds(gfx::Rect(100, 100, 400, 400)); | 89   window1.SetBounds(gfx::Rect(100, 100, 400, 400)); | 
| 90   window1.SetVisibility(aura::Window::VISIBILITY_SHOWN); | 90   window1.Show(); | 
| 91   window1.SetParent(NULL); | 91   window1.SetParent(NULL); | 
| 92 | 92 | 
| 93   DemoWindowDelegate window_delegate2(SK_ColorRED); | 93   DemoWindowDelegate window_delegate2(SK_ColorRED); | 
| 94   aura::Window window2(&window_delegate2); | 94   aura::Window window2(&window_delegate2); | 
| 95   window2.set_id(2); | 95   window2.set_id(2); | 
| 96   window2.Init(); | 96   window2.Init(); | 
| 97   window2.SetBounds(gfx::Rect(200, 200, 350, 350)); | 97   window2.SetBounds(gfx::Rect(200, 200, 350, 350)); | 
| 98   window2.SetVisibility(aura::Window::VISIBILITY_SHOWN); | 98   window2.Show(); | 
| 99   window2.SetParent(NULL); | 99   window2.SetParent(NULL); | 
| 100 | 100 | 
| 101   DemoWindowDelegate window_delegate3(SK_ColorGREEN); | 101   DemoWindowDelegate window_delegate3(SK_ColorGREEN); | 
| 102   aura::Window window3(&window_delegate3); | 102   aura::Window window3(&window_delegate3); | 
| 103   window3.set_id(3); | 103   window3.set_id(3); | 
| 104   window3.Init(); | 104   window3.Init(); | 
| 105   window3.SetBounds(gfx::Rect(10, 10, 50, 50)); | 105   window3.SetBounds(gfx::Rect(10, 10, 50, 50)); | 
| 106   window3.SetVisibility(aura::Window::VISIBILITY_SHOWN); | 106   window3.Show(); | 
| 107   window3.SetParent(&window2); | 107   window3.SetParent(&window2); | 
| 108 | 108 | 
| 109   aura::Desktop::GetInstance()->Run(); | 109   aura::Desktop::GetInstance()->Run(); | 
| 110   return 0; | 110   return 0; | 
| 111 } | 111 } | 
| 112 | 112 | 
| OLD | NEW | 
|---|