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

Unified Diff: athena/test/sample_activity.h

Issue 314303004: Use webview in web activity (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/test/DEPS ('k') | athena/test/sample_activity.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/test/sample_activity.h
diff --git a/athena/test/sample_activity.h b/athena/test/sample_activity.h
index b95801cfd5c1859ccd0e6f001e31ae070eaea2b5..04745a51d73a24420d628715e53220bda3a77478 100644
--- a/athena/test/sample_activity.h
+++ b/athena/test/sample_activity.h
@@ -15,7 +15,9 @@ namespace test {
class SampleActivity : public Activity,
public ActivityViewModel {
public:
- SampleActivity(SkColor color, SkColor content, const std::string& title);
+ SampleActivity(SkColor color,
+ SkColor contents_color,
+ const std::string& title);
virtual ~SampleActivity();
private:
@@ -25,12 +27,12 @@ class SampleActivity : public Activity,
// athena::ActivityViewModel:
virtual SkColor GetRepresentativeColor() OVERRIDE;
virtual std::string GetTitle() OVERRIDE;
- virtual aura::Window* GetNativeWindow() OVERRIDE;
+ virtual views::View* GetContentsView() OVERRIDE;
SkColor color_;
- SkColor content_color_;
+ SkColor contents_color_;
std::string title_;
- scoped_ptr<aura::Window> window_;
+ views::View* contents_view_;
DISALLOW_COPY_AND_ASSIGN(SampleActivity);
};
« no previous file with comments | « athena/test/DEPS ('k') | athena/test/sample_activity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698