mash/browser/browser.cc - Issue 2419063003: Move services/shell to services/service_manager

Side by Side Diff: mash/browser/browser.cc

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

Patch Set: 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:

« no previous file with comments | « mash/browser/browser.h ('k') | mash/browser/main.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 "mash/browser/browser.h"	5 #include "mash/browser/browser.h"

6	6

7 #include "base/macros.h"	7 #include "base/macros.h"

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

9 #include "base/memory/weak_ptr.h"	9 #include "base/memory/weak_ptr.h"

10 #include "base/message_loop/message_loop.h"	10 #include "base/message_loop/message_loop.h"

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

12 #include "base/strings/string_util.h"	12 #include "base/strings/string_util.h"

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

14 #include "base/threading/thread_task_runner_handle.h"	14 #include "base/threading/thread_task_runner_handle.h"

15 #include "base/timer/timer.h"	15 #include "base/timer/timer.h"

16 #include "mash/browser/debug_view.h"	16 #include "mash/browser/debug_view.h"

17 #include "mash/public/interfaces/launchable.mojom.h"	17 #include "mash/public/interfaces/launchable.mojom.h"

18 #include "services/navigation/public/cpp/view.h"	18 #include "services/navigation/public/cpp/view.h"

19 #include "services/navigation/public/cpp/view_delegate.h"	19 #include "services/navigation/public/cpp/view_delegate.h"

20 #include "services/navigation/public/cpp/view_observer.h"	20 #include "services/navigation/public/cpp/view_observer.h"

21 #include "services/navigation/public/interfaces/view.mojom.h"	21 #include "services/navigation/public/interfaces/view.mojom.h"

22 #include "services/shell/public/c/main.h"	22 #include "services/service_manager/public/c/main.h"

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

24 #include "services/shell/public/cpp/service.h"	24 #include "services/service_manager/public/cpp/service.h"

25 #include "services/shell/public/cpp/service_runner.h"	25 #include "services/service_manager/public/cpp/service_runner.h"

26 #include "services/tracing/public/cpp/provider.h"	26 #include "services/tracing/public/cpp/provider.h"

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

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

29 #include "ui/aura/mus/mus_util.h"	29 #include "ui/aura/mus/mus_util.h"

30 #include "ui/base/models/menu_model.h"	30 #include "ui/base/models/menu_model.h"

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

32 #include "ui/gfx/paint_throbber.h"	32 #include "ui/gfx/paint_throbber.h"

33 #include "ui/gfx/text_constants.h"	33 #include "ui/gfx/text_constants.h"

34 #include "ui/native_theme/native_theme.h"	34 #include "ui/native_theme/native_theme.h"

35 #include "ui/views/background.h"	35 #include "ui/views/background.h"

(...skipping 859 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
895 AddWindow(window);	895 AddWindow(window);

896 }	896 }

897	897

898 void Browser::Create(const shell::Identity& remote_identity,	898 void Browser::Create(const shell::Identity& remote_identity,

899 mojom::LaunchableRequest request) {	899 mojom::LaunchableRequest request) {

900 bindings_.AddBinding(this, std::move(request));	900 bindings_.AddBinding(this, std::move(request));

901 }	901 }

902	902

903 } // namespace browser	903 } // namespace browser

904 } // namespace mash	904 } // namespace mash

OLD	NEW