components/font_service/font_service_app.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: components/font_service/font_service_app.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 | « components/font_service/font_service_app.h ('k') | components/font_service/main.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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 "components/font_service/font_service_app.h"	5 #include "components/font_service/font_service_app.h"

6	6

7 #include <utility>	7 #include <utility>

8	8

9 #include "base/files/file.h"	9 #include "base/files/file.h"

10 #include "base/files/file_path.h"	10 #include "base/files/file_path.h"

11 #include "mojo/public/cpp/system/platform_handle.h"	11 #include "mojo/public/cpp/system/platform_handle.h"

12 #include "services/shell/public/cpp/connection.h"	12 #include "services/service_manager/public/cpp/connection.h"

13	13

14 static_assert(	14 static_assert(

15 static_cast<uint32_t>(SkFontStyle::kUpright_Slant) ==	15 static_cast<uint32_t>(SkFontStyle::kUpright_Slant) ==

16 static_cast<uint32_t>(font_service::mojom::TypefaceSlant::ROMAN),	16 static_cast<uint32_t>(font_service::mojom::TypefaceSlant::ROMAN),

17 "Skia and font service flags must match");	17 "Skia and font service flags must match");

18 static_assert(	18 static_assert(

19 static_cast<uint32_t>(SkFontStyle::kItalic_Slant) ==	19 static_cast<uint32_t>(SkFontStyle::kItalic_Slant) ==

20 static_cast<uint32_t>(font_service::mojom::TypefaceSlant::ITALIC),	20 static_cast<uint32_t>(font_service::mojom::TypefaceSlant::ITALIC),

21 "Skia and font service flags must match");	21 "Skia and font service flags must match");

22 static_assert(	22 static_assert(

(...skipping 96 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
119 int count = paths_.size();	119 int count = paths_.size();

120 for (int i = 0; i < count; ++i) {	120 for (int i = 0; i < count; ++i) {

121 if (path == paths_[i])	121 if (path == paths_[i])

122 return i;	122 return i;

123 }	123 }

124 paths_.emplace_back(path);	124 paths_.emplace_back(path);

125 return count;	125 return count;

126 }	126 }

127	127

128 } // namespace font_service	128 } // namespace font_service

OLD	NEW