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

Side by Side Diff: athena/activity/public/activity.h

Issue 653563004: NULL -> nullptr under athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src@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/activity/activity_manager_unittest.cc ('k') | athena/activity/public/activity_manager.h » ('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_ACTIVITY_PUBLIC_ACTIVITY_H_ 5 #ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_H_
6 #define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_H_ 6 #define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "athena/athena_export.h" 10 #include "athena/athena_export.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 // Returns the current media state. 87 // Returns the current media state.
88 virtual ActivityMediaState GetMediaState() = 0; 88 virtual ActivityMediaState GetMediaState() = 0;
89 89
90 // Returns the window for the activity. This can be used to determine the 90 // Returns the window for the activity. This can be used to determine the
91 // stacking order of this activity against others. 91 // stacking order of this activity against others.
92 // TODO(oshima): Consider returning base::Window window instead, 92 // TODO(oshima): Consider returning base::Window window instead,
93 // which has Show/ShowInactive and other control methods. 93 // which has Show/ShowInactive and other control methods.
94 virtual aura::Window* GetWindow() = 0; 94 virtual aura::Window* GetWindow() = 0;
95 95
96 // Returns the web contents used to draw the content of the activity. 96 // Returns the web contents used to draw the content of the activity.
97 // This may return NULL if the web content is not available. 97 // This may return nullptr if the web content is not available.
98 virtual content::WebContents* GetWebContents() = 0; 98 virtual content::WebContents* GetWebContents() = 0;
99 99
100 protected: 100 protected:
101 virtual ~Activity() {} 101 virtual ~Activity() {}
102 }; 102 };
103 103
104 } // namespace athena 104 } // namespace athena
105 105
106 #endif // ATHENA_ACTIVITY_PUBLIC_ACTIVITY_H_ 106 #endif // ATHENA_ACTIVITY_PUBLIC_ACTIVITY_H_
OLDNEW
« no previous file with comments | « athena/activity/activity_manager_unittest.cc ('k') | athena/activity/public/activity_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698