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

Side by Side Diff: athena/main/placeholder.cc

Issue 596493002: Add actiivity in factory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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/home/home_card_unittest.cc ('k') | athena/main/url_search_provider.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 #include "athena/main/placeholder.h" 5 #include "athena/main/placeholder.h"
6 6
7 #include "athena/activity/public/activity_factory.h" 7 #include "athena/activity/public/activity_factory.h"
8 #include "athena/activity/public/activity_manager.h"
9 #include "athena/resources/grit/athena_resources.h" 8 #include "athena/resources/grit/athena_resources.h"
10 #include "athena/system/public/system_ui.h" 9 #include "athena/system/public/system_ui.h"
11 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
12 #include "ui/gfx/image/image_skia.h" 11 #include "ui/gfx/image/image_skia.h"
13 12
14 void CreateTestPages(content::BrowserContext* browser_context) { 13 void CreateTestPages(content::BrowserContext* browser_context) {
15 const char* kTestURLs[] = { 14 const char* kTestURLs[] = {
16 "http://cyan.bikeshed.com", "https://news.google.com", 15 "http://cyan.bikeshed.com", "https://news.google.com",
17 "http://blue.bikeshed.com", "https://www.google.com", 16 "http://blue.bikeshed.com", "https://www.google.com",
18 }; 17 };
19 for (size_t i = 0; i < arraysize(kTestURLs); ++i) { 18 for (size_t i = 0; i < arraysize(kTestURLs); ++i) {
20 athena::ActivityManager::Get()->AddActivity( 19 athena::ActivityFactory::Get()->CreateWebActivity(
21 athena::ActivityFactory::Get()->CreateWebActivity( 20 browser_context, base::string16(), GURL(kTestURLs[i]));
22 browser_context, base::string16(), GURL(kTestURLs[i])));
23 } 21 }
24 } 22 }
25 23
26 void SetupBackgroundImage() { 24 void SetupBackgroundImage() {
27 const gfx::ImageSkia wallpaper = *ui::ResourceBundle::GetSharedInstance() 25 const gfx::ImageSkia wallpaper = *ui::ResourceBundle::GetSharedInstance()
28 .GetImageSkiaNamed(IDR_ATHENA_BACKGROUND); 26 .GetImageSkiaNamed(IDR_ATHENA_BACKGROUND);
29 athena::SystemUI::Get()->SetBackgroundImage(wallpaper); 27 athena::SystemUI::Get()->SetBackgroundImage(wallpaper);
30 } 28 }
OLDNEW
« no previous file with comments | « athena/home/home_card_unittest.cc ('k') | athena/main/url_search_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698