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

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: 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 // AppActivity: 72 // AppActivity:
73 virtual views::WebView* GetWebView() OVERRIDE { return NULL; } 73 virtual views::WebView* GetWebView() OVERRIDE { return NULL; }
74 74
75 // ActivityViewModel: 75 // ActivityViewModel:
76 virtual void Init() OVERRIDE {} 76 virtual void Init() OVERRIDE {}
77 virtual SkColor GetRepresentativeColor() const OVERRIDE { return 0; } 77 virtual SkColor GetRepresentativeColor() const OVERRIDE { return 0; }
78 virtual base::string16 GetTitle() const OVERRIDE { return title_; } 78 virtual base::string16 GetTitle() const OVERRIDE { return title_; }
79 virtual bool UsesFrame() const OVERRIDE { return true; } 79 virtual bool UsesFrame() const OVERRIDE { return true; }
80 virtual views::View* GetContentsView() OVERRIDE { return view_; } 80 virtual views::View* GetContentsView() OVERRIDE { return view_; }
81 virtual views::Widget* CreateWidget() OVERRIDE { return NULL; } 81 virtual views::Widget* CreateWidget() OVERRIDE { return NULL; }
82 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE { 82 virtual scoped_ptr<gfx::Image> GetOverviewModeImage() OVERRIDE {
83 return gfx::ImageSkia(); 83 return scoped_ptr<gfx::Image>(new gfx::Image());
84 } 84 }
85 85
86 private: 86 private:
87 // If known the registry which holds all activities for the associated app. 87 // If known the registry which holds all activities for the associated app.
88 AppActivityRegistry* app_activity_registry_; 88 AppActivityRegistry* app_activity_registry_;
89 89
90 // The title of the activity. 90 // The title of the activity.
91 base::string16 title_; 91 base::string16 title_;
92 92
93 // Our view. 93 // Our view.
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 // However - the restart in this test framework does not really restart and 422 // However - the restart in this test framework does not really restart and
423 // all objects should be still there.. 423 // all objects should be still there..
424 EXPECT_EQ(1, AppRegistry::Get()->NumberOfApplications()); 424 EXPECT_EQ(1, AppRegistry::Get()->NumberOfApplications());
425 EXPECT_TRUE(app_activity_registry->unloaded_activity_proxy()); 425 EXPECT_TRUE(app_activity_registry->unloaded_activity_proxy());
426 Activity::Delete(app_activity_registry->unloaded_activity_proxy()); 426 Activity::Delete(app_activity_registry->unloaded_activity_proxy());
427 EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications()); 427 EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications());
428 } 428 }
429 429
430 } // namespace test 430 } // namespace test
431 } // namespace athena 431 } // namespace athena
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698