Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

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

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 | « mash/browser/BUILD.gn ('k') | mash/browser/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef MASH_BROWSER_BROWSER_H_ 5 #ifndef MASH_BROWSER_BROWSER_H_
6 #define MASH_BROWSER_BROWSER_H_ 6 #define MASH_BROWSER_BROWSER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "mash/public/interfaces/launchable.mojom.h" 11 #include "mash/public/interfaces/launchable.mojom.h"
12 #include "mojo/public/cpp/bindings/binding_set.h" 12 #include "mojo/public/cpp/bindings/binding_set.h"
13 #include "services/shell/public/cpp/service.h" 13 #include "services/service_manager/public/cpp/service.h"
14 #include "services/tracing/public/cpp/provider.h" 14 #include "services/tracing/public/cpp/provider.h"
15 15
16 namespace navigation { 16 namespace navigation {
17 class View; 17 class View;
18 } 18 }
19 19
20 namespace views { 20 namespace views {
21 class AuraInit; 21 class AuraInit;
22 class Widget; 22 class Widget;
23 class WindowManagerConnection; 23 class WindowManagerConnection;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 std::unique_ptr<views::AuraInit> aura_init_; 61 std::unique_ptr<views::AuraInit> aura_init_;
62 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; 62 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
63 63
64 DISALLOW_COPY_AND_ASSIGN(Browser); 64 DISALLOW_COPY_AND_ASSIGN(Browser);
65 }; 65 };
66 66
67 } // namespace browser 67 } // namespace browser
68 } // namespace mash 68 } // namespace mash
69 69
70 #endif // MASH_BROWSER_BROWSER_H_ 70 #endif // MASH_BROWSER_BROWSER_H_
OLDNEW
« no previous file with comments | « mash/browser/BUILD.gn ('k') | mash/browser/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698