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

Side by Side Diff: ash/test/test_launcher_delegate.cc

Issue 71653003: ash: Rename LauncherModel to ShelfModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome changes Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « ash/test/test_launcher_delegate.h ('k') | ash/test/test_shell_delegate.h » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/test/test_launcher_delegate.h" 5 #include "ash/test/test_launcher_delegate.h"
6 6
7 #include "ash/launcher/launcher_item_delegate_manager.h" 7 #include "ash/launcher/launcher_item_delegate_manager.h"
8 #include "ash/launcher/launcher_model.h" 8 #include "ash/shelf/shelf_model.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/test/test_launcher_item_delegate.h" 10 #include "ash/test/test_launcher_item_delegate.h"
11 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "grit/ash_resources.h" 13 #include "grit/ash_resources.h"
14 #include "ui/aura/window.h" 14 #include "ui/aura/window.h"
15 15
16 namespace ash { 16 namespace ash {
17 namespace test { 17 namespace test {
18 18
19 TestLauncherDelegate* TestLauncherDelegate::instance_ = NULL; 19 TestLauncherDelegate* TestLauncherDelegate::instance_ = NULL;
20 20
21 TestLauncherDelegate::TestLauncherDelegate(LauncherModel* model) 21 TestLauncherDelegate::TestLauncherDelegate(ShelfModel* model)
22 : model_(model) { 22 : model_(model) {
23 CHECK(!instance_); 23 CHECK(!instance_);
24 instance_ = this; 24 instance_ = this;
25 } 25 }
26 26
27 TestLauncherDelegate::~TestLauncherDelegate() { 27 TestLauncherDelegate::~TestLauncherDelegate() {
28 instance_ = NULL; 28 instance_ = NULL;
29 } 29 }
30 30
31 void TestLauncherDelegate::AddLauncherItem(aura::Window* window) { 31 void TestLauncherDelegate::AddLauncherItem(aura::Window* window) {
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 109
110 bool TestLauncherDelegate::IsAppPinned(const std::string& app_id) { 110 bool TestLauncherDelegate::IsAppPinned(const std::string& app_id) {
111 return false; 111 return false;
112 } 112 }
113 113
114 void TestLauncherDelegate::UnpinAppWithID(const std::string& app_id) { 114 void TestLauncherDelegate::UnpinAppWithID(const std::string& app_id) {
115 } 115 }
116 116
117 } // namespace test 117 } // namespace test
118 } // namespace ash 118 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_launcher_delegate.h ('k') | ash/test/test_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698