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

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

Issue 631333003: Adding application lifetime tests to athena, allowing to override focus request for applciations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 years, 2 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
« no previous file with comments | « athena/content/app_activity_browsertest.cc ('k') | athena/content/app_activity_proxy.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_PROXY_H_ 5 #ifndef ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_
6 #define ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_ 6 #define ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "athena/activity/public/activity.h" 10 #include "athena/activity/public/activity.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 // upon initialization. Once moved, this value gets reset since the object 66 // upon initialization. Once moved, this value gets reset since the object
67 // can go away at any time. 67 // can go away at any time.
68 AppActivity* replaced_activity_; 68 AppActivity* replaced_activity_;
69 69
70 // The associated view. 70 // The associated view.
71 views::View* view_; 71 views::View* view_;
72 72
73 // The content proxy. 73 // The content proxy.
74 scoped_ptr<ContentProxy> content_proxy_; 74 scoped_ptr<ContentProxy> content_proxy_;
75 75
76 // True if restart got already called.
77 bool restart_called_;
78
76 DISALLOW_COPY_AND_ASSIGN(AppActivityProxy); 79 DISALLOW_COPY_AND_ASSIGN(AppActivityProxy);
77 }; 80 };
78 81
79 } // namespace athena 82 } // namespace athena
80 83
81 #endif // ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_ 84 #endif // ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_
OLDNEW
« no previous file with comments | « athena/content/app_activity_browsertest.cc ('k') | athena/content/app_activity_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698