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

Side by Side Diff: athena/content/app_activity_unittest.cc

Issue 591693002: Creating PNG images from web content to be used by OverviewMode navigation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed 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_factory.h" 5 #include "athena/activity/public/activity_factory.h"
6 #include "athena/activity/public/activity_manager.h" 6 #include "athena/activity/public/activity_manager.h"
7 #include "athena/content/app_activity.h" 7 #include "athena/content/app_activity.h"
8 #include "athena/content/app_activity_registry.h" 8 #include "athena/content/app_activity_registry.h"
9 #include "athena/content/public/app_registry.h" 9 #include "athena/content/public/app_registry.h"
10 #include "athena/extensions/public/extensions_delegate.h" 10 #include "athena/extensions/public/extensions_delegate.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 return view_->GetWidget()->GetNativeWindow(); 69 return view_->GetWidget()->GetNativeWindow();
70 } 70 }
71 71
72 // ActivityViewModel: 72 // ActivityViewModel:
73 virtual void Init() OVERRIDE {} 73 virtual void Init() OVERRIDE {}
74 virtual SkColor GetRepresentativeColor() const OVERRIDE { return 0; } 74 virtual SkColor GetRepresentativeColor() const OVERRIDE { return 0; }
75 virtual base::string16 GetTitle() const OVERRIDE { return title_; } 75 virtual base::string16 GetTitle() const OVERRIDE { return title_; }
76 virtual bool UsesFrame() const OVERRIDE { return true; } 76 virtual bool UsesFrame() const OVERRIDE { return true; }
77 virtual views::View* GetContentsView() OVERRIDE { return view_; } 77 virtual views::View* GetContentsView() OVERRIDE { return view_; }
78 virtual views::Widget* CreateWidget() OVERRIDE { return NULL; } 78 virtual views::Widget* CreateWidget() OVERRIDE { return NULL; }
79 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE { 79 virtual gfx::Image GetOverviewModeImage() OVERRIDE { return gfx::Image(); }
80 return gfx::ImageSkia();
81 }
82 80
83 private: 81 private:
84 // If known the registry which holds all activities for the associated app. 82 // If known the registry which holds all activities for the associated app.
85 AppActivityRegistry* app_activity_registry_; 83 AppActivityRegistry* app_activity_registry_;
86 84
87 // The title of the activity. 85 // The title of the activity.
88 base::string16 title_; 86 base::string16 title_;
89 87
90 // Our view. 88 // Our view.
91 views::View* view_; 89 views::View* view_;
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 // However - the restart in this test framework does not really restart and 418 // However - the restart in this test framework does not really restart and
421 // all objects should be still there.. 419 // all objects should be still there..
422 EXPECT_EQ(1, AppRegistry::Get()->NumberOfApplications()); 420 EXPECT_EQ(1, AppRegistry::Get()->NumberOfApplications());
423 EXPECT_TRUE(app_activity_registry->unloaded_activity_proxy()); 421 EXPECT_TRUE(app_activity_registry->unloaded_activity_proxy());
424 Activity::Delete(app_activity_registry->unloaded_activity_proxy()); 422 Activity::Delete(app_activity_registry->unloaded_activity_proxy());
425 EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications()); 423 EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications());
426 } 424 }
427 425
428 } // namespace test 426 } // namespace test
429 } // namespace athena 427 } // namespace athena
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698