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

Side by Side Diff: athena/test/base/sample_activity.h

Issue 702473005: athena: Remove ActivityViewModel::CreateWidget(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « athena/content/web_activity.cc ('k') | athena/test/base/sample_activity.cc » ('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 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 #ifndef ATHENA_TEST_BASE_SAMPLE_ACTIVITY_H_ 5 #ifndef ATHENA_TEST_BASE_SAMPLE_ACTIVITY_H_
6 #define ATHENA_TEST_BASE_SAMPLE_ACTIVITY_H_ 6 #define ATHENA_TEST_BASE_SAMPLE_ACTIVITY_H_
7 7
8 #include "athena/activity/public/activity.h" 8 #include "athena/activity/public/activity.h"
9 #include "athena/activity/public/activity_view_model.h" 9 #include "athena/activity/public/activity_view_model.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 24 matching lines...) Expand all
35 aura::Window* GetWindow() override; 35 aura::Window* GetWindow() override;
36 content::WebContents* GetWebContents() override; 36 content::WebContents* GetWebContents() override;
37 37
38 // athena::ActivityViewModel: 38 // athena::ActivityViewModel:
39 void Init() override; 39 void Init() override;
40 SkColor GetRepresentativeColor() const override; 40 SkColor GetRepresentativeColor() const override;
41 base::string16 GetTitle() const override; 41 base::string16 GetTitle() const override;
42 gfx::ImageSkia GetIcon() const override; 42 gfx::ImageSkia GetIcon() const override;
43 bool UsesFrame() const override; 43 bool UsesFrame() const override;
44 views::View* GetContentsView() override; 44 views::View* GetContentsView() override;
45 views::Widget* CreateWidget() override;
46 gfx::ImageSkia GetOverviewModeImage() override; 45 gfx::ImageSkia GetOverviewModeImage() override;
47 void PrepareContentsForOverview() override; 46 void PrepareContentsForOverview() override;
48 void ResetContentsView() override; 47 void ResetContentsView() override;
49 48
50 private: 49 private:
51 SkColor color_; 50 SkColor color_;
52 SkColor contents_color_; 51 SkColor contents_color_;
53 base::string16 title_; 52 base::string16 title_;
54 views::View* contents_view_; 53 views::View* contents_view_;
55 54
56 // The current state for this activity. 55 // The current state for this activity.
57 ActivityState current_state_; 56 ActivityState current_state_;
58 57
59 // This is to emulate real implementation. 58 // This is to emulate real implementation.
60 scoped_ptr<AcceleratorManager> accelerator_manager_; 59 scoped_ptr<AcceleratorManager> accelerator_manager_;
61 60
62 DISALLOW_COPY_AND_ASSIGN(SampleActivity); 61 DISALLOW_COPY_AND_ASSIGN(SampleActivity);
63 }; 62 };
64 63
65 } // namespace test 64 } // namespace test
66 } // namespace athena 65 } // namespace athena
67 66
68 #endif // ATHENA_TEST_BASE_SAMPLE_ACTIVITY_H_ 67 #endif // ATHENA_TEST_BASE_SAMPLE_ACTIVITY_H_
OLDNEW
« no previous file with comments | « athena/content/web_activity.cc ('k') | athena/test/base/sample_activity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698