ui/views/view_unittest.cc - Issue 9562038: ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ui/views/view_unittest.cc

Issue 9562038: ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: more two win fixes Created 8 years, 9 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/views/view_text_utils.cc ('k') | ui/views/widget/native_widget_win.h » ('j') | no next file with comments »

OLD	NEW
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 <map>	5 #include <map>

6	6

7 #include "base/memory/scoped_ptr.h"	7 #include "base/memory/scoped_ptr.h"

8 #include "base/rand_util.h"	8 #include "base/rand_util.h"

9 #include "base/string_util.h"	9 #include "base/string_util.h"

10 #include "base/utf_string_conversions.h"	10 #include "base/utf_string_conversions.h"

11 #include "testing/gmock/include/gmock/gmock.h"	11 #include "testing/gmock/include/gmock/gmock.h"

12 #include "ui/base/accelerators/accelerator.h"	12 #include "ui/base/accelerators/accelerator.h"

13 #include "ui/base/clipboard/clipboard.h"	13 #include "ui/base/clipboard/clipboard.h"

14 #include "ui/base/keycodes/keyboard_codes.h"	14 #include "ui/base/keycodes/keyboard_codes.h"

15 #include "ui/base/models/simple_menu_model.h"	15 #include "ui/base/models/simple_menu_model.h"

16 #include "ui/gfx/canvas_skia.h"	16 #include "ui/gfx/canvas.h"

17 #include "ui/gfx/compositor/compositor.h"	17 #include "ui/gfx/compositor/compositor.h"

18 #include "ui/gfx/compositor/layer.h"	18 #include "ui/gfx/compositor/layer.h"

19 #include "ui/gfx/compositor/layer_animator.h"	19 #include "ui/gfx/compositor/layer_animator.h"

20 #include "ui/gfx/path.h"	20 #include "ui/gfx/path.h"

21 #include "ui/gfx/transform.h"	21 #include "ui/gfx/transform.h"

22 #include "ui/views/background.h"	22 #include "ui/views/background.h"

23 #include "ui/views/controls/button/button_dropdown.h"	23 #include "ui/views/controls/button/button_dropdown.h"

24 #include "ui/views/controls/button/checkbox.h"	24 #include "ui/views/controls/button/checkbox.h"

25 #include "ui/views/controls/native/native_view_host.h"	25 #include "ui/views/controls/native/native_view_host.h"

26 #include "ui/views/controls/scroll_view.h"	26 #include "ui/views/controls/scroll_view.h"

(...skipping 3070 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
3097	3097

3098 // Move c1 to the front. The layers should have moved too.	3098 // Move c1 to the front. The layers should have moved too.

3099 content->ReorderChildView(c1, -1);	3099 content->ReorderChildView(c1, -1);

3100 EXPECT_EQ(c1->layer(), parent_layer->children()[1]);	3100 EXPECT_EQ(c1->layer(), parent_layer->children()[1]);

3101 EXPECT_EQ(c2->layer(), parent_layer->children()[0]);	3101 EXPECT_EQ(c2->layer(), parent_layer->children()[0]);

3102 }	3102 }

3103	3103

3104 #endif // USE_AURA	3104 #endif // USE_AURA

3105	3105

3106 } // namespace views	3106 } // namespace views

OLD	NEW