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

Side by Side Diff: ash/shell/shelf_delegate_impl.h

Issue 2177663002: mash: Move ownership of ShelfDelegate to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix WallpaperManagerBrowserTest Created 4 years, 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_SHELL_SHELF_DELEGATE_IMPL_H_ 5 #ifndef ASH_SHELL_SHELF_DELEGATE_IMPL_H_
6 #define ASH_SHELL_SHELF_DELEGATE_IMPL_H_ 6 #define ASH_SHELL_SHELF_DELEGATE_IMPL_H_
7 7
8 #include "ash/shelf/shelf_delegate.h" 8 #include "ash/common/shelf/shelf_delegate.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 11
12 namespace ash { 12 namespace ash {
13 namespace shell { 13 namespace shell {
14 14
15 // TODO(jamescook): Replace with TestShelfDelegate so we don't have to maintain 15 // TODO(jamescook): Replace with TestShelfDelegate so we don't have to maintain
16 // two stub implementations. 16 // two stub implementations.
17 class ShelfDelegateImpl : public ShelfDelegate { 17 class ShelfDelegateImpl : public ShelfDelegate {
18 public: 18 public:
(...skipping 15 matching lines...) Expand all
34 void UnpinAppWithID(const std::string& app_id) override; 34 void UnpinAppWithID(const std::string& app_id) override;
35 35
36 private: 36 private:
37 DISALLOW_COPY_AND_ASSIGN(ShelfDelegateImpl); 37 DISALLOW_COPY_AND_ASSIGN(ShelfDelegateImpl);
38 }; 38 };
39 39
40 } // namespace shell 40 } // namespace shell
41 } // namespace ash 41 } // namespace ash
42 42
43 #endif // ASH_SHELL_SHELF_DELEGATE_IMPL_H_ 43 #endif // ASH_SHELL_SHELF_DELEGATE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698