diff options
author | gunsch@chromium.org <gunsch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 16:39:26 +0000 |
---|---|---|
committer | gunsch@chromium.org <gunsch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 17:17:12 +0000 |
commit | 2667a234cfdc5055bfa58dbab40f677cc35e37c5 (patch) | |
tree | 6b898b8ab3619157f0a31e86cd5f36875d86efef /chromecast | |
parent | b09e20fdf795733058be0a974e961dd61ffce291 (diff) | |
download | chromium_src-2667a234cfdc5055bfa58dbab40f677cc35e37c5.zip chromium_src-2667a234cfdc5055bfa58dbab40f677cc35e37c5.tar.gz chromium_src-2667a234cfdc5055bfa58dbab40f677cc35e37c5.tar.bz2 |
Chromecast: Adds WebUI stubs for cast shell.
Chromecast products provide different WebUIs for pages to display. This
provides an appropriate initialization hook.
R=byungchul@chromium.org,lcwu@chromium.org
BUG=336640
Review URL: https://codereview.chromium.org/472183002
Cr-Commit-Position: refs/heads/master@{#289916}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromecast')
-rw-r--r-- | chromecast/chromecast.gyp | 3 | ||||
-rw-r--r-- | chromecast/shell/browser/cast_browser_main_parts.cc | 3 | ||||
-rw-r--r-- | chromecast/shell/browser/webui/webui_cast.h | 18 | ||||
-rw-r--r-- | chromecast/shell/browser/webui/webui_cast_simple.cc | 15 |
4 files changed, 39 insertions, 0 deletions
diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp index 4ec7656..5881dd0 100644 --- a/chromecast/chromecast.gyp +++ b/chromecast/chromecast.gyp @@ -159,6 +159,7 @@ 'shell/browser/geolocation/cast_access_token_store.h', 'shell/browser/url_request_context_factory.cc', 'shell/browser/url_request_context_factory.h', + 'shell/browser/webui/webui_cast.h', 'shell/common/cast_content_client.cc', 'shell/common/cast_content_client.h', 'shell/renderer/cast_content_renderer_client.cc', @@ -168,6 +169,7 @@ ['chromecast_branding=="Chrome"', { 'dependencies': [ 'internal/chromecast_internal.gyp:cast_gfx_internal', + 'internal/chromecast_internal.gyp:cast_shell_internal', ], }, { 'dependencies': [ @@ -175,6 +177,7 @@ ], 'sources': [ 'shell/browser/devtools/remote_debugging_server_simple.cc', + 'shell/browser/webui/webui_cast_simple.cc', ], }], ], diff --git a/chromecast/shell/browser/cast_browser_main_parts.cc b/chromecast/shell/browser/cast_browser_main_parts.cc index d1a82c2..d5e24d7 100644 --- a/chromecast/shell/browser/cast_browser_main_parts.cc +++ b/chromecast/shell/browser/cast_browser_main_parts.cc @@ -13,6 +13,7 @@ #include "chromecast/shell/browser/cast_browser_context.h" #include "chromecast/shell/browser/devtools/remote_debugging_server.h" #include "chromecast/shell/browser/url_request_context_factory.h" +#include "chromecast/shell/browser/webui/webui_cast.h" namespace chromecast { namespace shell { @@ -75,6 +76,8 @@ void CastBrowserMainParts::PreMainMessageLoopRun() { browser_context_.reset(new CastBrowserContext(url_request_context_factory_)); dev_tools_.reset(new RemoteDebuggingServer()); + InitializeWebUI(); + cast_service_.reset(CastService::Create(browser_context_.get())); cast_service_->Start(); } diff --git a/chromecast/shell/browser/webui/webui_cast.h b/chromecast/shell/browser/webui/webui_cast.h new file mode 100644 index 0000000..f0588cc --- /dev/null +++ b/chromecast/shell/browser/webui/webui_cast.h @@ -0,0 +1,18 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROMECAST_SHELL_BROWSER_WEBUI_WEBUI_CAST_H_ +#define CHROMECAST_SHELL_BROWSER_WEBUI_WEBUI_CAST_H_ + +namespace chromecast { +namespace shell { + +// Initializes all WebUIs needed for the Chromecast shell. This should be +// implemented on a per-product basis. +void InitializeWebUI(); + +} // namespace shell +} // namespace chromecast + +#endif // CHROMECAST_SHELL_BROWSER_UI_WEBUI_CAST_H_ diff --git a/chromecast/shell/browser/webui/webui_cast_simple.cc b/chromecast/shell/browser/webui/webui_cast_simple.cc new file mode 100644 index 0000000..76c2a64 --- /dev/null +++ b/chromecast/shell/browser/webui/webui_cast_simple.cc @@ -0,0 +1,15 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chromecast/shell/browser/webui/webui_cast.h" + +namespace chromecast { +namespace shell { + +void InitializeWebUI() { + // Intentional no-op for public cast_shell build. +} + +} // namespace shell +} // namespace chromecast |