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

Unified Diff: chromecast/service/cast_service.cc

Issue 397143003: Build-level separation of default CastService implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@chromecast-resource-fix
Patch Set: addressing damienv's comments Created 6 years, 5 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 | « chromecast/service/cast_service.h ('k') | chromecast/service/cast_service_simple.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/service/cast_service.cc
diff --git a/chromecast/service/cast_service.cc b/chromecast/service/cast_service.cc
index f072523c460bb883fbf98487741f5d84e26d2e50..1533b20178318ca9c7f1ee49b6d0fd34dc13e36f 100644
--- a/chromecast/service/cast_service.cc
+++ b/chromecast/service/cast_service.cc
@@ -4,71 +4,11 @@
#include "chromecast/service/cast_service.h"
-#include "base/command_line.h"
-#include "base/files/file_path.h"
-#include "base/macros.h"
+#include "base/logging.h"
#include "base/threading/thread_checker.h"
-#include "content/public/browser/render_view_host.h"
-#include "content/public/browser/web_contents.h"
-#include "net/base/filename_util.h"
-#include "ui/aura/env.h"
-#include "ui/aura/layout_manager.h"
-#include "ui/aura/test/test_screen.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_tree_host.h"
-#include "ui/gfx/size.h"
-#include "url/gurl.h"
namespace chromecast {
-namespace {
-
-GURL GetStartupURL() {
- base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
- const base::CommandLine::StringVector& args = command_line->GetArgs();
-
- if (args.empty())
- return GURL("http://www.google.com/");
-
- GURL url(args[0]);
- if (url.is_valid() && url.has_scheme())
- return url;
-
- return net::FilePathToFileURL(base::FilePath(args[0]));
-}
-
-class FillLayout : public aura::LayoutManager {
- public:
- explicit FillLayout(aura::Window* root) : root_(root) {}
- virtual ~FillLayout() {}
-
- private:
- // aura::LayoutManager:
- virtual void OnWindowResized() OVERRIDE {}
-
- virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE {
- child->SetBounds(root_->bounds());
- }
-
- virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE {}
-
- virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE {}
-
- virtual void OnChildWindowVisibilityChanged(aura::Window* child,
- bool visible) OVERRIDE {}
-
- virtual void SetChildBounds(aura::Window* child,
- const gfx::Rect& requested_bounds) OVERRIDE {
- SetChildBoundsDirect(child, requested_bounds);
- }
-
- aura::Window* root_;
-
- DISALLOW_COPY_AND_ASSIGN(FillLayout);
-};
-
-} // namespace
-
CastService::CastService(content::BrowserContext* browser_context)
: browser_context_(browser_context),
stopped_(true),
@@ -80,60 +20,17 @@ CastService::~CastService() {
DCHECK(stopped_);
}
-void CastService::Initialize() {
- PlatformInitialize();
-}
-
void CastService::Start() {
DCHECK(thread_checker_->CalledOnValidThread());
Initialize();
-
- // Aura initialization
- gfx::Size initial_size = gfx::Size(1280, 720);
- // TODO(lcwu): http://crbug.com/391074. Chromecast only needs a minimal
- // implementation of gfx::screen and aura's TestScreen will do for now.
- // Change the code to use ozone's screen implementation when it is ready.
- aura::TestScreen* screen = aura::TestScreen::Create(initial_size);
- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen);
- CHECK(aura::Env::GetInstance());
- window_tree_host_.reset(
- aura::WindowTreeHost::Create(gfx::Rect(initial_size)));
- window_tree_host_->InitHost();
- window_tree_host_->window()->SetLayoutManager(
- new FillLayout(window_tree_host_->window()));
- window_tree_host_->Show();
-
- // Create a WebContents
- content::WebContents::CreateParams create_params(browser_context_, NULL);
- create_params.routing_id = MSG_ROUTING_NONE;
- create_params.initial_size = initial_size;
- web_contents_.reset(content::WebContents::Create(create_params));
-
- // Add and show content's view/window
- aura::Window* content_window = web_contents_->GetNativeView();
- aura::Window* parent = window_tree_host_->window();
- if (!parent->Contains(content_window)) {
- parent->AddChild(content_window);
- }
- content_window->Show();
-
- web_contents_->GetController().LoadURL(GetStartupURL(),
- content::Referrer(),
- content::PAGE_TRANSITION_TYPED,
- std::string());
-
stopped_ = false;
+ StartInternal();
}
void CastService::Stop() {
DCHECK(thread_checker_->CalledOnValidThread());
-
- web_contents_->GetRenderViewHost()->ClosePage();
- window_tree_host_.reset();
- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL);
- aura::Env::DeleteInstance();
- web_contents_.reset();
+ StopInternal();
stopped_ = true;
}
« no previous file with comments | « chromecast/service/cast_service.h ('k') | chromecast/service/cast_service_simple.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698