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

Side by Side Diff: ash/wm/system_modal_container_layout_manager.cc

Issue 196723009: Not submitted - Fixing invalid visibility states with layers which showed up in unittests ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/wm/system_modal_container_layout_manager.h" 5 #include "ash/wm/system_modal_container_layout_manager.h"
6 6
7 #include "ash/session_state_delegate.h" 7 #include "ash/session_state_delegate.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_window_ids.h" 9 #include "ash/shell_window_ids.h"
10 #include "ash/wm/system_modal_container_event_filter.h" 10 #include "ash/wm/system_modal_container_event_filter.h"
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 params.bounds = Shell::GetScreen()->GetDisplayNearestWindow( 153 params.bounds = Shell::GetScreen()->GetDisplayNearestWindow(
154 container_).bounds(); 154 container_).bounds();
155 modal_background_->Init(params); 155 modal_background_->Init(params);
156 modal_background_->GetNativeView()->SetName( 156 modal_background_->GetNativeView()->SetName(
157 "SystemModalContainerLayoutManager.ModalBackground"); 157 "SystemModalContainerLayoutManager.ModalBackground");
158 views::View* contents_view = new views::View(); 158 views::View* contents_view = new views::View();
159 // TODO(jamescook): This could be SK_ColorWHITE for the new dialog style. 159 // TODO(jamescook): This could be SK_ColorWHITE for the new dialog style.
160 contents_view->set_background( 160 contents_view->set_background(
161 views::Background::CreateSolidBackground(SK_ColorBLACK)); 161 views::Background::CreateSolidBackground(SK_ColorBLACK));
162 modal_background_->SetContentsView(contents_view); 162 modal_background_->SetContentsView(contents_view);
163 modal_background_->GetNativeView()->layer()->SetOpacity(0.0f); 163 // The layer should at the beginning be invisible and fade then in. Since
164 // the visibility is true an opacity of 0.0 would be illegal and Show()
165 // will complaint, we have to start with a slightly bigger value.
166 modal_background_->GetNativeView()->layer()->SetOpacity(0.001f);
164 } 167 }
165 168
166 ui::ScopedLayerAnimationSettings settings( 169 ui::ScopedLayerAnimationSettings settings(
167 modal_background_->GetNativeView()->layer()->GetAnimator()); 170 modal_background_->GetNativeView()->layer()->GetAnimator());
168 modal_background_->Show(); 171 modal_background_->Show();
169 modal_background_->GetNativeView()->layer()->SetOpacity(0.5f); 172 modal_background_->GetNativeView()->layer()->SetOpacity(0.5f);
170 container_->StackChildAtTop(modal_background_->GetNativeView()); 173 container_->StackChildAtTop(modal_background_->GetNativeView());
171 } 174 }
172 175
173 void SystemModalContainerLayoutManager::DestroyModalBackground() { 176 void SystemModalContainerLayoutManager::DestroyModalBackground() {
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 void SystemModalContainerLayoutManager::RemoveModalWindow( 218 void SystemModalContainerLayoutManager::RemoveModalWindow(
216 aura::Window* window) { 219 aura::Window* window) {
217 aura::Window::Windows::iterator it = 220 aura::Window::Windows::iterator it =
218 std::find(modal_windows_.begin(), modal_windows_.end(), window); 221 std::find(modal_windows_.begin(), modal_windows_.end(), window);
219 if (it != modal_windows_.end()) 222 if (it != modal_windows_.end())
220 modal_windows_.erase(it); 223 modal_windows_.erase(it);
221 } 224 }
222 225
223 } // namespace internal 226 } // namespace internal
224 } // namespace ash 227 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698