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

Unified Diff: athena/main/athena_shell.cc

Issue 316323002: Introduces ActivityFactory for SampleActivity. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix 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/main/athena_main.gyp ('k') | athena/main/sample_activity.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/main/athena_shell.cc
diff --git a/athena/main/athena_shell.cc b/athena/main/athena_shell.cc
index 48fbc9e5aa7dcceddcf494f35c4c74378d3b4f45..cd017ed8eff0642738e7eb4f3f26863534f078ac 100644
--- a/athena/main/athena_shell.cc
+++ b/athena/main/athena_shell.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "athena/activity/public/activity_factory.h"
#include "athena/activity/public/activity_manager.h"
-#include "athena/main/sample_activity.h"
#include "athena/test/athena_test_helper.h"
#include "base/at_exit.h"
#include "base/command_line.h"
@@ -11,7 +11,6 @@
#include "base/message_loop/message_loop.h"
#include "base/path_service.h"
#include "base/run_loop.h"
-#include "third_party/skia/include/core/SkColor.h"
#include "ui/aura/window_tree_host.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
@@ -32,9 +31,9 @@ class UIShell {
}
void InitSampleActivities() {
- athena::Activity* task = new SampleActivity(
- SK_ColorRED, SK_ColorGREEN, std::string("Activity 1"));
- athena::ActivityManager::Get()->AddActivity(task);
+ athena::ActivityManager::Get()->AddActivity(
+ athena::ActivityFactory::Get()->CreateWebActivity(
+ NULL, GURL("http://www.google.com/")));
}
private:
« no previous file with comments | « athena/main/athena_main.gyp ('k') | athena/main/sample_activity.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698