services/ui/demo/mus_demo.cc - Issue 2419723002: Move services/shell to services/service_manager

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: services/ui/demo/mus_demo.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)

Patch Set: rebase Created 4 years, 2 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 | « services/ui/demo/mus_demo.h ('k') | services/ui/demo/mus_demo_unittests.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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 "services/ui/demo/mus_demo.h"	5 #include "services/ui/demo/mus_demo.h"

6	6

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

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

9 #include "services/shell/public/cpp/connector.h"	9 #include "services/service_manager/public/cpp/connector.h"

10 #include "services/ui/demo/bitmap_uploader.h"	10 #include "services/ui/demo/bitmap_uploader.h"

11 #include "services/ui/public/cpp/gpu_service.h"	11 #include "services/ui/public/cpp/gpu_service.h"

12 #include "services/ui/public/cpp/window.h"	12 #include "services/ui/public/cpp/window.h"

13 #include "services/ui/public/cpp/window_tree_client.h"	13 #include "services/ui/public/cpp/window_tree_client.h"

14 #include "third_party/skia/include/core/SkCanvas.h"	14 #include "third_party/skia/include/core/SkCanvas.h"

15 #include "third_party/skia/include/core/SkColor.h"	15 #include "third_party/skia/include/core/SkColor.h"

16 #include "third_party/skia/include/core/SkImageInfo.h"	16 #include "third_party/skia/include/core/SkImageInfo.h"

17 #include "third_party/skia/include/core/SkPaint.h"	17 #include "third_party/skia/include/core/SkPaint.h"

18 #include "third_party/skia/include/core/SkRect.h"	18 #include "third_party/skia/include/core/SkRect.h"

19 #include "ui/gfx/geometry/rect.h"	19 #include "ui/gfx/geometry/rect.h"

(...skipping 164 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
184 new std::vector<unsigned char>(addr, addr + bytes));	184 new std::vector<unsigned char>(addr, addr + bytes));

185 bitmap_.unlockPixels();	185 bitmap_.unlockPixels();

186	186

187 // Send frame to MUS via BitmapUploader.	187 // Send frame to MUS via BitmapUploader.

188 uploader_->SetBitmap(bounds.width(), bounds.height(), std::move(data),	188 uploader_->SetBitmap(bounds.width(), bounds.height(), std::move(data),

189 BitmapUploader::BGRA);	189 BitmapUploader::BGRA);

190 }	190 }

191	191

192 } // namespace demo	192 } // namespace demo

193 } // namespace ui	193 } // namespace ui

OLD	NEW