Commit 3803f14f authored by Shawn Gallea's avatar Shawn Gallea Committed by Commit Bot

EXO: Adjusted client_base for cast

Moved shell and aura shell checks to when not using fullscreen shell.
This is needed for cast to run fullscreen clients.

Bug: 896710
Test: Compiled client on ChromeOS.
Change-Id: Ie4c408d8266a0957ad9b57ea332a8e38171b2be9
Reviewed-on: https://chromium-review.googlesource.com/c/1331170Reviewed-by: default avatarDaniele Castagna <dcastagna@chromium.org>
Reviewed-by: default avatarDaniel Nicoara <dnicoara@chromium.org>
Commit-Queue: Shawn Gallea <sagallea@google.com>
Cr-Commit-Position: refs/heads/master@{#607235}
parent f619c2b4
...@@ -419,18 +419,10 @@ bool ClientBase::Init(const InitParams& params) { ...@@ -419,18 +419,10 @@ bool ClientBase::Init(const InitParams& params) {
LOG(ERROR) << "Can't find linux_dmabuf interface"; LOG(ERROR) << "Can't find linux_dmabuf interface";
return false; return false;
} }
if (!globals_.shell) {
LOG(ERROR) << "Can't find shell interface";
return false;
}
if (!globals_.seat) { if (!globals_.seat) {
LOG(ERROR) << "Can't find seat interface"; LOG(ERROR) << "Can't find seat interface";
return false; return false;
} }
if (!globals_.aura_shell) {
LOG(ERROR) << "Can't find aura shell interface";
return false;
}
#if defined(USE_GBM) #if defined(USE_GBM)
sk_sp<const GrGLInterface> native_interface; sk_sp<const GrGLInterface> native_interface;
...@@ -577,6 +569,14 @@ bool ClientBase::Init(const InitParams& params) { ...@@ -577,6 +569,14 @@ bool ClientBase::Init(const InitParams& params) {
surface_.get(), 0, nullptr); surface_.get(), 0, nullptr);
} else { } else {
if (!globals_.shell) {
LOG(ERROR) << "Can't find shell interface";
return false;
}
if (!globals_.aura_shell) {
LOG(ERROR) << "Can't find aura shell interface";
return false;
}
std::unique_ptr<wl_shell_surface> shell_surface( std::unique_ptr<wl_shell_surface> shell_surface(
static_cast<wl_shell_surface*>( static_cast<wl_shell_surface*>(
wl_shell_get_shell_surface(globals_.shell.get(), surface_.get()))); wl_shell_get_shell_surface(globals_.shell.get(), surface_.get())));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment