ash/mus_property_mirror_ash_unittest.cc - Issue 2878133002: mash: Serialize ShelfIDs for property conversion and transport.

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: ash/mus_property_mirror_ash_unittest.cc

Issue 2878133002: mash: Serialize ShelfIDs for property conversion and transport. (Closed)

Patch Set: Remove |user_windows_with_items_| entries in workaround; disable a test in mash. Created 3 years, 7 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

« no previous file with comments | « ash/mus/window_manager.cc ('k') | ash/public/cpp/shelf_types.h » ('j') | ash/public/cpp/shelf_types.h » ('J')

OLD	NEW
1 // Copyright 2017 The Chromium Authors. All rights reserved.	1 // Copyright 2017 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 "ash/public/cpp/mus_property_mirror_ash.h"	5 #include "ash/public/cpp/mus_property_mirror_ash.h"

6	6

7 #include <string>	7 #include <string>

8	8

	9 #include "ash/public/cpp/shelf_types.h"

9 #include "ash/public/cpp/window_properties.h"	10 #include "ash/public/cpp/window_properties.h"

10 #include "ash/test/ash_test_base.h"	11 #include "ash/test/ash_test_base.h"

11 #include "base/strings/string16.h"	12 #include "base/strings/string16.h"

12 #include "base/strings/utf_string_conversions.h"	13 #include "base/strings/utf_string_conversions.h"

13 #include "ui/aura/client/aura_constants.h"	14 #include "ui/aura/client/aura_constants.h"

14 #include "ui/aura/window.h"	15 #include "ui/aura/window.h"

15	16

16 namespace ash {	17 namespace ash {

17	18

18 using MusPropertyMirrorAshTest = test::AshTestBase;	19 using MusPropertyMirrorAshTest = test::AshTestBase;

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
66 window_1->SetProperty(aura::client::kWindowIconKey, new gfx::ImageSkia());	67 window_1->SetProperty(aura::client::kWindowIconKey, new gfx::ImageSkia());

67 EXPECT_NE(nullptr, window_1->GetProperty(aura::client::kWindowIconKey));	68 EXPECT_NE(nullptr, window_1->GetProperty(aura::client::kWindowIconKey));

68 mus_property_mirror_ash.MirrorPropertyFromWidgetWindowToRootWindow(	69 mus_property_mirror_ash.MirrorPropertyFromWidgetWindowToRootWindow(

69 window_1.get(), window_2.get(), aura::client::kWindowIconKey);	70 window_1.get(), window_2.get(), aura::client::kWindowIconKey);

70 EXPECT_NE(nullptr, window_2->GetProperty(aura::client::kWindowIconKey));	71 EXPECT_NE(nullptr, window_2->GetProperty(aura::client::kWindowIconKey));

71 EXPECT_NE(window_1->GetProperty(aura::client::kWindowIconKey),	72 EXPECT_NE(window_1->GetProperty(aura::client::kWindowIconKey),

72 window_2->GetProperty(aura::client::kWindowIconKey));	73 window_2->GetProperty(aura::client::kWindowIconKey));

73 }	74 }

74	75

75 } // namespace ash	76 } // namespace ash

OLD	NEW