Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Side by Side Diff: views/aura_desktop/aura_desktop_main.cc

Issue 7739016: aura-views: Make views_aura_desktop compile and run on linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gfx/platform_font_gtk.cc ('k') | views/controls/menu/menu_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "aura/desktop.h" 5 #include "aura/desktop.h"
6 #include "aura/desktop_host.h" 6 #include "aura/desktop_host.h"
7 #include "aura/window.h" 7 #include "aura/window.h"
8 #include "aura/window_delegate.h" 8 #include "aura/window_delegate.h"
9 #include "base/at_exit.h" 9 #include "base/at_exit.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/i18n/icu_util.h" 11 #include "base/i18n/icu_util.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "third_party/skia/include/core/SkXfermode.h" 14 #include "third_party/skia/include/core/SkXfermode.h"
15 #include "ui/base/resource/resource_bundle.h" 15 #include "ui/base/resource/resource_bundle.h"
16 #include "ui/base/ui_base_paths.h" 16 #include "ui/base/ui_base_paths.h"
17 #include "ui/gfx/canvas.h" 17 #include "ui/gfx/canvas.h"
18 #include "ui/gfx/canvas_skia.h" 18 #include "ui/gfx/canvas_skia.h"
19 #include "ui/gfx/rect.h" 19 #include "ui/gfx/rect.h"
20 #include "views/widget/widget.h" 20 #include "views/widget/widget.h"
21 #include "views/widget/widget_delegate.h" 21 #include "views/widget/widget_delegate.h"
22 22
23 #if !defined(OS_WIN)
24 #include "aura/hit_test.h"
25 #endif
26
23 namespace { 27 namespace {
24 28
25 // Trivial WindowDelegate implementation that draws a colored background. 29 // Trivial WindowDelegate implementation that draws a colored background.
26 class DemoWindowDelegate : public aura::WindowDelegate { 30 class DemoWindowDelegate : public aura::WindowDelegate {
27 public: 31 public:
28 explicit DemoWindowDelegate(SkColor color) : color_(color) {} 32 explicit DemoWindowDelegate(SkColor color) : color_(color) {}
29 33
30 // Overridden from aura::WindowDelegate: 34 // Overridden from aura::WindowDelegate:
31 virtual void OnFocus() OVERRIDE {} 35 virtual void OnFocus() OVERRIDE {}
32 virtual void OnBlur() OVERRIDE {} 36 virtual void OnBlur() OVERRIDE {}
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 161
158 TestWindowContents* contents = new TestWindowContents; 162 TestWindowContents* contents = new TestWindowContents;
159 views::Widget* views_window = views::Widget::CreateWindowWithParentAndBounds( 163 views::Widget* views_window = views::Widget::CreateWindowWithParentAndBounds(
160 contents, &window2, gfx::Rect(120, 150, 200, 200)); 164 contents, &window2, gfx::Rect(120, 150, 200, 200));
161 views_window->Show(); 165 views_window->Show();
162 166
163 aura::Desktop::GetInstance()->Run(); 167 aura::Desktop::GetInstance()->Run();
164 return 0; 168 return 0;
165 } 169 }
166 170
OLDNEW
« no previous file with comments | « ui/gfx/platform_font_gtk.cc ('k') | views/controls/menu/menu_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698