ui/views/view_unittest.cc - Issue 16757004: Use a direct include of strings headers in ui/, part 3.

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 16757004: Use a direct include of strings headers in ui/, part 3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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/views/view_text_utils.h ('k') | ui/views/views_delegate.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/strings/string_util.h"

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

11 #include "grit/ui_strings.h"	11 #include "grit/ui_strings.h"

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

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

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

15 #include "ui/base/events/event.h"	15 #include "ui/base/events/event.h"

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

17 #include "ui/base/l10n/l10n_util.h"	17 #include "ui/base/l10n/l10n_util.h"

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

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

(...skipping 3414 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
3434 const std::vector<ui::Layer*>& child_layers_post = root_layer->children();	3434 const std::vector<ui::Layer*>& child_layers_post = root_layer->children();

3435 ASSERT_EQ(3u, child_layers_post.size());	3435 ASSERT_EQ(3u, child_layers_post.size());

3436 EXPECT_EQ(v1->layer(), child_layers_post[0]);	3436 EXPECT_EQ(v1->layer(), child_layers_post[0]);

3437 EXPECT_EQ(v2->layer(), child_layers_post[1]);	3437 EXPECT_EQ(v2->layer(), child_layers_post[1]);

3438 EXPECT_EQ(v1_old_layer, child_layers_post[2]);	3438 EXPECT_EQ(v1_old_layer, child_layers_post[2]);

3439 }	3439 }

3440	3440

3441 #endif // USE_AURA	3441 #endif // USE_AURA

3442	3442

3443 } // namespace views	3443 } // namespace views

OLD	NEW