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