| 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 "chrome/browser/ui/views/aura/aura_init.h" | 5 #include "chrome/browser/ui/views/aura/aura_init.h" | 
| 6 | 6 | 
| 7 #include "aura/desktop.h" |  | 
| 8 #include "aura/window_delegate.h" |  | 
| 9 #include "chrome/browser/ui/views/chrome_views_delegate.h" | 7 #include "chrome/browser/ui/views/chrome_views_delegate.h" | 
|  | 8 #include "ui/aura/desktop.h" | 
|  | 9 #include "ui/aura/window_delegate.h" | 
| 10 #include "ui/gfx/canvas_skia.h" | 10 #include "ui/gfx/canvas_skia.h" | 
| 11 #include "views/view.h" | 11 #include "views/view.h" | 
| 12 #include "views/widget/widget.h" | 12 #include "views/widget/widget.h" | 
| 13 | 13 | 
| 14 namespace browser { | 14 namespace browser { | 
| 15 | 15 | 
| 16 namespace { | 16 namespace { | 
| 17 | 17 | 
| 18 // Trivial WindowDelegate implementation that draws a colored background. | 18 // Trivial WindowDelegate implementation that draws a colored background. | 
| 19 class DemoWindowDelegate : public aura::WindowDelegate { | 19 class DemoWindowDelegate : public aura::WindowDelegate { | 
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 87   DemoWindowDelegate* window_delegate1 = new DemoWindowDelegate(SK_ColorBLUE); | 87   DemoWindowDelegate* window_delegate1 = new DemoWindowDelegate(SK_ColorBLUE); | 
| 88   aura::Window* window1 = new aura::Window(window_delegate1); | 88   aura::Window* window1 = new aura::Window(window_delegate1); | 
| 89   window1->set_id(1); | 89   window1->set_id(1); | 
| 90   window1->Init(); | 90   window1->Init(); | 
| 91   window1->SetBounds(gfx::Rect(100, 100, 400, 400), 0); | 91   window1->SetBounds(gfx::Rect(100, 100, 400, 400), 0); | 
| 92   window1->SetVisibility(aura::Window::VISIBILITY_SHOWN); | 92   window1->SetVisibility(aura::Window::VISIBILITY_SHOWN); | 
| 93   window1->SetParent(NULL); | 93   window1->SetParent(NULL); | 
| 94 } | 94 } | 
| 95 | 95 | 
| 96 }  // namespace browser | 96 }  // namespace browser | 
| OLD | NEW | 
|---|