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

Side by Side Diff: athena/resource_manager/resource_manager_unittest.cc

Issue 518673007: Make activities have a thick border when in overview mode part 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_overview2
Patch Set: Created 6 years, 3 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 2014 The Chromium Authors. All rights reserved. 1 /// Copyright 2014 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 "athena/activity/public/activity.h" 5 #include "athena/activity/public/activity.h"
6 #include "athena/activity/public/activity_manager.h" 6 #include "athena/activity/public/activity_manager.h"
7 #include "athena/activity/public/activity_view_model.h" 7 #include "athena/activity/public/activity_view_model.h"
8 #include "athena/resource_manager/memory_pressure_notifier.h" 8 #include "athena/resource_manager/memory_pressure_notifier.h"
9 #include "athena/resource_manager/public/resource_manager.h" 9 #include "athena/resource_manager/public/resource_manager.h"
10 #include "athena/test/athena_test_base.h" 10 #include "athena/test/athena_test_base.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 } 47 }
48 48
49 // ActivityViewModel overrides: 49 // ActivityViewModel overrides:
50 virtual void Init() OVERRIDE {} 50 virtual void Init() OVERRIDE {}
51 virtual SkColor GetRepresentativeColor() const OVERRIDE { return 0; } 51 virtual SkColor GetRepresentativeColor() const OVERRIDE { return 0; }
52 virtual base::string16 GetTitle() const OVERRIDE { return title_; } 52 virtual base::string16 GetTitle() const OVERRIDE { return title_; }
53 virtual bool UsesFrame() const OVERRIDE { return true; } 53 virtual bool UsesFrame() const OVERRIDE { return true; }
54 virtual views::View* GetContentsView() OVERRIDE { return view_; } 54 virtual views::View* GetContentsView() OVERRIDE { return view_; }
55 virtual void CreateOverviewModeImage() OVERRIDE {} 55 virtual void CreateOverviewModeImage() OVERRIDE {}
56 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE { return image_; } 56 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE { return image_; }
57 virtual void PrepareContentsForOverview() OVERRIDE {}
58 virtual void ResetContentsView() OVERRIDE {}
57 59
58 private: 60 private:
59 // The presentation values. 61 // The presentation values.
60 const base::string16 title_; 62 const base::string16 title_;
61 gfx::ImageSkia image_; 63 gfx::ImageSkia image_;
62 64
63 // The associated view. 65 // The associated view.
64 views::View* view_; 66 views::View* view_;
65 67
66 // The current state. 68 // The current state.
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 ResourceManager::Get()->SetMemoryPressureAndStopMonitoring( 200 ResourceManager::Get()->SetMemoryPressureAndStopMonitoring(
199 MemoryPressureObserver::MEMORY_PRESSURE_CRITICAL); 201 MemoryPressureObserver::MEMORY_PRESSURE_CRITICAL);
200 DCHECK_NE(Activity::ACTIVITY_UNLOADED, app_visible->GetCurrentState()); 202 DCHECK_NE(Activity::ACTIVITY_UNLOADED, app_visible->GetCurrentState());
201 DCHECK_EQ(Activity::ACTIVITY_UNLOADED, app_media_locked1->GetCurrentState()); 203 DCHECK_EQ(Activity::ACTIVITY_UNLOADED, app_media_locked1->GetCurrentState());
202 DCHECK_EQ(Activity::ACTIVITY_UNLOADED, app_unloadable->GetCurrentState()); 204 DCHECK_EQ(Activity::ACTIVITY_UNLOADED, app_unloadable->GetCurrentState());
203 DCHECK_EQ(Activity::ACTIVITY_UNLOADED, app_media_locked2->GetCurrentState()); 205 DCHECK_EQ(Activity::ACTIVITY_UNLOADED, app_media_locked2->GetCurrentState());
204 } 206 }
205 207
206 } // namespace test 208 } // namespace test
207 } // namespace athena 209 } // namespace athena
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698