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

Side by Side Diff: ui/aura/demo/demo_main.cc

Issue 10566009: app_list: Fix shadow bleeds over launcher button and steals mouse events (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix aura_demo compilation Created 8 years, 6 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/app_list/app_list_view.cc ('k') | ui/aura/test/test_window_delegate.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 } 61 }
62 virtual bool CanFocus() OVERRIDE { return true; } 62 virtual bool CanFocus() OVERRIDE { return true; }
63 virtual void OnCaptureLost() OVERRIDE {} 63 virtual void OnCaptureLost() OVERRIDE {}
64 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { 64 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
65 canvas->DrawColor(color_, SkXfermode::kSrc_Mode); 65 canvas->DrawColor(color_, SkXfermode::kSrc_Mode);
66 } 66 }
67 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {} 67 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {}
68 virtual void OnWindowDestroying() OVERRIDE {} 68 virtual void OnWindowDestroying() OVERRIDE {}
69 virtual void OnWindowDestroyed() OVERRIDE {} 69 virtual void OnWindowDestroyed() OVERRIDE {}
70 virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE {} 70 virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE {}
71 virtual bool HasHitTestMask() const OVERRIDE { return false; }
72 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {}
71 73
72 private: 74 private:
73 SkColor color_; 75 SkColor color_;
74 76
75 DISALLOW_COPY_AND_ASSIGN(DemoWindowDelegate); 77 DISALLOW_COPY_AND_ASSIGN(DemoWindowDelegate);
76 }; 78 };
77 79
78 class DemoStackingClient : public aura::client::StackingClient { 80 class DemoStackingClient : public aura::client::StackingClient {
79 public: 81 public:
80 explicit DemoStackingClient(aura::RootWindow* root_window) 82 explicit DemoStackingClient(aura::RootWindow* root_window)
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 window3.Show(); 145 window3.Show();
144 window3.SetParent(&window2); 146 window3.SetParent(&window2);
145 147
146 root_window->ShowRootWindow(); 148 root_window->ShowRootWindow();
147 MessageLoopForUI::current()->Run(); 149 MessageLoopForUI::current()->Run();
148 150
149 ui::CompositorTestSupport::Terminate(); 151 ui::CompositorTestSupport::Terminate();
150 152
151 return 0; 153 return 0;
152 } 154 }
OLDNEW
« no previous file with comments | « ui/app_list/app_list_view.cc ('k') | ui/aura/test/test_window_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698