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

Side by Side Diff: chrome/browser/ui/views/aura/aura_init.cc

Issue 7979026: Fix compilation error in aura_init.cc (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 | « no previous file | no next file » | 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 "chrome/browser/ui/views/aura/aura_init.h" 5 #include "chrome/browser/ui/views/aura/aura_init.h"
6 6
7 #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" 8 #include "ui/aura/desktop.h"
9 #include "ui/aura/hit_test.h" 9 #include "ui/aura/hit_test.h"
10 #include "ui/aura/window_delegate.h" 10 #include "ui/aura/window_delegate.h"
(...skipping 17 matching lines...) Expand all
28 virtual void OnBlur() OVERRIDE {} 28 virtual void OnBlur() OVERRIDE {}
29 virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE { 29 virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE {
30 return false; 30 return false;
31 } 31 }
32 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE { 32 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE {
33 return HTCLIENT; 33 return HTCLIENT;
34 } 34 }
35 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE { 35 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE {
36 return true; 36 return true;
37 } 37 }
38 virtual void OnCaptureLost() OVERRIDE {
39 }
38 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { 40 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
39 canvas->AsCanvasSkia()->drawColor(color_, SkXfermode::kSrc_Mode); 41 canvas->AsCanvasSkia()->drawColor(color_, SkXfermode::kSrc_Mode);
40 } 42 }
41 virtual void OnWindowDestroying() OVERRIDE { 43 virtual void OnWindowDestroying() OVERRIDE {
42 } 44 }
43 virtual void OnWindowDestroyed() OVERRIDE { 45 virtual void OnWindowDestroyed() OVERRIDE {
44 delete this; 46 delete this;
45 } 47 }
46 48
47 private: 49 private:
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 DemoWindowDelegate* window_delegate1 = new DemoWindowDelegate(SK_ColorBLUE); 92 DemoWindowDelegate* window_delegate1 = new DemoWindowDelegate(SK_ColorBLUE);
91 aura::Window* window1 = new aura::Window(window_delegate1); 93 aura::Window* window1 = new aura::Window(window_delegate1);
92 window1->set_id(1); 94 window1->set_id(1);
93 window1->Init(); 95 window1->Init();
94 window1->SetBounds(gfx::Rect(100, 100, 400, 400), 0); 96 window1->SetBounds(gfx::Rect(100, 100, 400, 400), 0);
95 window1->SetVisibility(aura::Window::VISIBILITY_SHOWN); 97 window1->SetVisibility(aura::Window::VISIBILITY_SHOWN);
96 window1->SetParent(NULL); 98 window1->SetParent(NULL);
97 } 99 }
98 100
99 } // namespace browser 101 } // namespace browser
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698