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

Side by Side Diff: ash/shelf/shelf_model_unittest.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (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/shelf/shelf_model_observer.h ('k') | ash/shelf/shelf_tooltip_manager.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 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 #include "ash/common/shelf/shelf_model.h" 5 #include "ash/shelf/shelf_model.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 9
10 #include "ash/common/shelf/shelf_model_observer.h" 10 #include "ash/shelf/shelf_model_observer.h"
11 #include "base/strings/stringprintf.h" 11 #include "base/strings/stringprintf.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 13
14 namespace ash { 14 namespace ash {
15 15
16 namespace { 16 namespace {
17 17
18 // ShelfModelObserver implementation that tracks what message are invoked. 18 // ShelfModelObserver implementation that tracks what message are invoked.
19 class TestShelfModelObserver : public ShelfModelObserver { 19 class TestShelfModelObserver : public ShelfModelObserver {
20 public: 20 public:
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 // Now change the type of the second item and make sure that it is moving 303 // Now change the type of the second item and make sure that it is moving
304 // behind the shortcuts. 304 // behind the shortcuts.
305 item.type = TYPE_APP; 305 item.type = TYPE_APP;
306 model_->Set(app2_index, item); 306 model_->Set(app2_index, item);
307 307
308 // The item should have moved in front of the app launcher. 308 // The item should have moved in front of the app launcher.
309 EXPECT_EQ(TYPE_APP, model_->items()[4].type); 309 EXPECT_EQ(TYPE_APP, model_->items()[4].type);
310 } 310 }
311 311
312 } // namespace ash 312 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_model_observer.h ('k') | ash/shelf/shelf_tooltip_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698