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

Side by Side Diff: athena/content/app_activity.h

Issue 707603002: athena: Use ActivityList where appropriate, and fix AppActivity tests. 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/activity/public/activity_manager.h ('k') | athena/content/app_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_CONTENT_APP_ACTIVITY_H_ 5 #ifndef ATHENA_CONTENT_APP_ACTIVITY_H_
6 #define ATHENA_CONTENT_APP_ACTIVITY_H_ 6 #define ATHENA_CONTENT_APP_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 "athena/content/app_activity_proxy.h" 10 #include "athena/content/app_activity_proxy.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 gfx::ImageSkia GetOverviewModeImage() override; 50 gfx::ImageSkia GetOverviewModeImage() override;
51 void PrepareContentsForOverview() override; 51 void PrepareContentsForOverview() override;
52 void ResetContentsView() override; 52 void ResetContentsView() override;
53 53
54 protected: 54 protected:
55 // Constructor for test. 55 // Constructor for test.
56 explicit AppActivity(const std::string& app_id); 56 explicit AppActivity(const std::string& app_id);
57 57
58 ~AppActivity() override; 58 ~AppActivity() override;
59 59
60 // Register this activity with its application.
61 void RegisterActivity();
62
63 AppActivityRegistry* app_activity_registry() {
64 return app_activity_registry_;
65 }
66
60 private: 67 private:
61 // content::WebContentsObserver: 68 // content::WebContentsObserver:
62 void TitleWasSet(content::NavigationEntry* entry, bool explicit_set) override; 69 void TitleWasSet(content::NavigationEntry* entry, bool explicit_set) override;
63 void DidUpdateFaviconURL( 70 void DidUpdateFaviconURL(
64 const std::vector<content::FaviconURL>& candidates) override; 71 const std::vector<content::FaviconURL>& candidates) override;
65 72
66 // Register this activity with its application.
67 void RegisterActivity();
68
69 // Hiding the contet proxy and showing the real content instead. 73 // Hiding the contet proxy and showing the real content instead.
70 void HideContentProxy(); 74 void HideContentProxy();
71 75
72 // Showing a content proxy instead of the real content to save resources. 76 // Showing a content proxy instead of the real content to save resources.
73 void ShowContentProxy(); 77 void ShowContentProxy();
74 78
75 const std::string app_id_; 79 const std::string app_id_;
76 80
77 views::WebView* web_view_; 81 views::WebView* web_view_;
78 82
(...skipping 12 matching lines...) Expand all
91 // destroyed before the activity, then it must be reset using 95 // destroyed before the activity, then it must be reset using
92 // SetActivityView(nullptr). 96 // SetActivityView(nullptr).
93 ActivityView* activity_view_; 97 ActivityView* activity_view_;
94 98
95 DISALLOW_COPY_AND_ASSIGN(AppActivity); 99 DISALLOW_COPY_AND_ASSIGN(AppActivity);
96 }; 100 };
97 101
98 } // namespace athena 102 } // namespace athena
99 103
100 #endif // ATHENA_CONTENT_APP_ACTIVITY_H_ 104 #endif // ATHENA_CONTENT_APP_ACTIVITY_H_
OLDNEW
« no previous file with comments | « athena/activity/public/activity_manager.h ('k') | athena/content/app_activity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698