Index: apps/app_window.cc |
diff --git a/apps/app_window.cc b/apps/app_window.cc |
index 5c91b5c2d52241181392787b5fe79cbc1252a06b..76f1618712302cc958c0fcc7141fd3d0fc827382 100644 |
--- a/apps/app_window.cc |
+++ b/apps/app_window.cc |
@@ -155,13 +155,14 @@ AppWindow::CreateParams::CreateParams() |
: window_type(AppWindow::WINDOW_TYPE_DEFAULT), |
frame(AppWindow::FRAME_CHROME), |
has_frame_color(false), |
- transparent_background(false), |
+ alpha_enabled(false), |
creator_process_id(0), |
state(ui::SHOW_STATE_DEFAULT), |
hidden(false), |
resizable(true), |
focused(true), |
- always_on_top(false) {} |
+ always_on_top(false) { |
garykac
2014/05/08 03:46:36
required by git cl format
|
+} |
AppWindow::CreateParams::~CreateParams() {} |
@@ -238,7 +239,8 @@ AppWindow::AppWindow(BrowserContext* context, |
fullscreen_types_(FULLSCREEN_TYPE_NONE), |
show_on_first_paint_(false), |
first_paint_complete_(false), |
- cached_always_on_top_(false) { |
+ cached_always_on_top_(false), |
+ cached_alpha_enabled_(false) { |
extensions::ExtensionsBrowserClient* client = |
extensions::ExtensionsBrowserClient::Get(); |
CHECK(!client->IsGuestSession(context) || context->IsOffTheRecord()) |
@@ -277,6 +279,8 @@ void AppWindow::Init(const GURL& url, |
if (new_params.state == ui::SHOW_STATE_FULLSCREEN) |
new_params.always_on_top = false; |
+ cached_alpha_enabled_ = new_params.alpha_enabled; |
+ |
native_app_window_.reset(delegate_->CreateNativeAppWindow(this, new_params)); |
if (!new_params.hidden) { |
@@ -732,6 +736,10 @@ void AppWindow::SetAlwaysOnTop(bool always_on_top) { |
bool AppWindow::IsAlwaysOnTop() const { return cached_always_on_top_; } |
+bool AppWindow::AlphaEnabled() const { |
+ return cached_alpha_enabled_; |
+} |
+ |
void AppWindow::GetSerializedState(base::DictionaryValue* properties) const { |
DCHECK(properties); |
@@ -740,6 +748,7 @@ void AppWindow::GetSerializedState(base::DictionaryValue* properties) const { |
properties->SetBoolean("minimized", native_app_window_->IsMinimized()); |
properties->SetBoolean("maximized", native_app_window_->IsMaximized()); |
properties->SetBoolean("alwaysOnTop", IsAlwaysOnTop()); |
+ properties->SetBoolean("alphaEnabled", AlphaEnabled()); |
properties->SetBoolean("hasFrameColor", native_app_window_->HasFrameColor()); |
// These properties are undocumented and are to enable testing. Alpha is |