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

Side by Side Diff: ash/mus/shell_delegate_mus.h

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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 | « ash/mus/shelf_delegate_mus.cc ('k') | ash/mus/shell_delegate_mus.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 ASH_MUS_SHELL_DELEGATE_MUS_H_ 5 #ifndef ASH_MUS_SHELL_DELEGATE_MUS_H_
6 #define ASH_MUS_SHELL_DELEGATE_MUS_H_ 6 #define ASH_MUS_SHELL_DELEGATE_MUS_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/shell_delegate.h" 10 #include "ash/common/shell_delegate.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 12
13 namespace service_manager { 13 namespace service_manager {
14 class Connector; 14 class Connector;
15 } 15 }
16 16
17 namespace ash { 17 namespace ash {
18 18
19 class ShellDelegateMus : public ShellDelegate { 19 class ShellDelegateMus : public ShellDelegate {
20 public: 20 public:
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 private: 52 private:
53 // |connector_| may be null in tests. 53 // |connector_| may be null in tests.
54 service_manager::Connector* connector_; 54 service_manager::Connector* connector_;
55 55
56 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus); 56 DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus);
57 }; 57 };
58 58
59 } // namespace ash 59 } // namespace ash
60 60
61 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_ 61 #endif // ASH_MUS_SHELL_DELEGATE_MUS_H_
OLDNEW
« no previous file with comments | « ash/mus/shelf_delegate_mus.cc ('k') | ash/mus/shell_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698