mash/wallpaper/wallpaper.cc - Issue 1662843002: Revert of Delete base/prefs and update callers to use components.

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: mash/wallpaper/wallpaper.cc

Issue 1662843002: Revert of Delete base/prefs and update callers to use components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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 | « mash/DEPS ('k') | third_party/libaddressinput/chromium/DEPS » ('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 "base/macros.h"	5 #include "base/macros.h"

	6 #include "base/prefs/pref_registry_simple.h"

6 #include "components/filesystem/public/cpp/prefs/pref_service_factory.h"	7 #include "components/filesystem/public/cpp/prefs/pref_service_factory.h"

7 #include "components/mus/public/cpp/property_type_converters.h"	8 #include "components/mus/public/cpp/property_type_converters.h"

8 #include "components/prefs/pref_registry_simple.h"

9 #include "mash/wm/public/interfaces/container.mojom.h"	9 #include "mash/wm/public/interfaces/container.mojom.h"

10 #include "mojo/public/c/system/main.h"	10 #include "mojo/public/c/system/main.h"

11 #include "mojo/services/tracing/public/cpp/tracing_impl.h"	11 #include "mojo/services/tracing/public/cpp/tracing_impl.h"

12 #include "mojo/shell/public/cpp/application_connection.h"	12 #include "mojo/shell/public/cpp/application_connection.h"

13 #include "mojo/shell/public/cpp/application_delegate.h"	13 #include "mojo/shell/public/cpp/application_delegate.h"

14 #include "mojo/shell/public/cpp/application_impl.h"	14 #include "mojo/shell/public/cpp/application_impl.h"

15 #include "mojo/shell/public/cpp/application_runner.h"	15 #include "mojo/shell/public/cpp/application_runner.h"

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

17 #include "ui/views/mus/aura_init.h"	17 #include "ui/views/mus/aura_init.h"

18 #include "ui/views/mus/native_widget_mus.h"	18 #include "ui/views/mus/native_widget_mus.h"

(...skipping 69 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
88	88

89 } // namespace	89 } // namespace

90 } // namespace wallpaper	90 } // namespace wallpaper

91 } // namespace mash	91 } // namespace mash

92	92

93 MojoResult MojoMain(MojoHandle shell_handle) {	93 MojoResult MojoMain(MojoHandle shell_handle) {

94 mojo::ApplicationRunner runner(	94 mojo::ApplicationRunner runner(

95 new mash::wallpaper::WallpaperApplicationDelegate);	95 new mash::wallpaper::WallpaperApplicationDelegate);

96 return runner.Run(shell_handle);	96 return runner.Run(shell_handle);

97 }	97 }

OLD	NEW