| OLD | NEW |
| 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.h" |
| 7 #include "athena/activity/public/activity_factory.h" | 8 #include "athena/activity/public/activity_factory.h" |
| 8 #include "athena/resources/grit/athena_resources.h" | 9 #include "athena/resources/grit/athena_resources.h" |
| 9 #include "athena/system/public/system_ui.h" | 10 #include "athena/system/public/system_ui.h" |
| 10 #include "ui/base/resource/resource_bundle.h" | 11 #include "ui/base/resource/resource_bundle.h" |
| 11 #include "ui/gfx/image/image_skia.h" | 12 #include "ui/gfx/image/image_skia.h" |
| 12 | 13 |
| 13 void CreateTestPages(content::BrowserContext* browser_context) { | 14 void CreateTestPages(content::BrowserContext* browser_context) { |
| 14 const char* kTestURLs[] = { | 15 const char* kTestURLs[] = { |
| 15 "http://cyan.bikeshed.com", "https://news.google.com", | 16 "http://cyan.bikeshed.com", "https://news.google.com", |
| 16 "http://blue.bikeshed.com", "https://www.google.com", | 17 "http://blue.bikeshed.com", "https://www.google.com", |
| 17 }; | 18 }; |
| 19 athena::ActivityFactory* factory = athena::ActivityFactory::Get(); |
| 18 for (size_t i = 0; i < arraysize(kTestURLs); ++i) { | 20 for (size_t i = 0; i < arraysize(kTestURLs); ++i) { |
| 19 athena::ActivityFactory::Get()->CreateWebActivity( | 21 athena::Activity* activity = factory->CreateWebActivity( |
| 20 browser_context, base::string16(), GURL(kTestURLs[i])); | 22 browser_context, base::string16(), GURL(kTestURLs[i])); |
| 23 athena::Activity::Show(activity); |
| 21 } | 24 } |
| 22 } | 25 } |
| 23 | 26 |
| 24 void SetupBackgroundImage() { | 27 void SetupBackgroundImage() { |
| 25 const gfx::ImageSkia wallpaper = *ui::ResourceBundle::GetSharedInstance() | 28 const gfx::ImageSkia wallpaper = *ui::ResourceBundle::GetSharedInstance() |
| 26 .GetImageSkiaNamed(IDR_ATHENA_BACKGROUND); | 29 .GetImageSkiaNamed(IDR_ATHENA_BACKGROUND); |
| 27 athena::SystemUI::Get()->SetBackgroundImage(wallpaper); | 30 athena::SystemUI::Get()->SetBackgroundImage(wallpaper); |
| 28 } | 31 } |
| OLD | NEW |