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

Side by Side Diff: ui/aura_shell/modal_container_layout_manager.cc

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ui/aura_shell/modal_container_layout_manager.h" 5 #include "ui/aura_shell/modal_container_layout_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "ui/aura/client/aura_constants.h" 8 #include "ui/aura/client/aura_constants.h"
9 #include "ui/aura/desktop.h" 9 #include "ui/aura/desktop.h"
10 #include "ui/aura/event.h" 10 #include "ui/aura/event.h"
11 #include "ui/aura/window.h" 11 #include "ui/aura/window.h"
12 #include "ui/aura_shell/modality_event_filter.h" 12 #include "ui/aura_shell/modality_event_filter.h"
13 #include "ui/aura_shell/shell.h" 13 #include "ui/aura_shell/shell.h"
14 #include "ui/aura_shell/stacking_controller.h" 14 #include "ui/aura_shell/stacking_controller.h"
15 #include "ui/gfx/canvas.h" 15 #include "ui/gfx/canvas.h"
16 #include "ui/gfx/compositor/layer.h" 16 #include "ui/gfx/compositor/layer.h"
17 #include "ui/gfx/compositor/layer_animator.h" 17 #include "ui/gfx/compositor/layer_animator.h"
18 #include "ui/views/widget/widget.h"
18 #include "views/view.h" 19 #include "views/view.h"
19 #include "views/widget/widget.h"
20 20
21 namespace aura_shell { 21 namespace aura_shell {
22 namespace internal { 22 namespace internal {
23 23
24 namespace { 24 namespace {
25 25
26 class ScreenView : public views::View { 26 class ScreenView : public views::View {
27 public: 27 public:
28 ScreenView() {} 28 ScreenView() {}
29 virtual ~ScreenView() {} 29 virtual ~ScreenView() {}
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 183
184 void ModalContainerLayoutManager::HideModalScreen() { 184 void ModalContainerLayoutManager::HideModalScreen() {
185 Shell::GetInstance()->RemoveDesktopEventFilter(modality_filter_.get()); 185 Shell::GetInstance()->RemoveDesktopEventFilter(modality_filter_.get());
186 ui::LayerAnimator::ScopedSettings settings( 186 ui::LayerAnimator::ScopedSettings settings(
187 modal_screen_->GetNativeView()->layer()->GetAnimator()); 187 modal_screen_->GetNativeView()->layer()->GetAnimator());
188 modal_screen_->GetNativeView()->layer()->SetOpacity(0.0f); 188 modal_screen_->GetNativeView()->layer()->SetOpacity(0.0f);
189 } 189 }
190 190
191 } // namespace internal 191 } // namespace internal
192 } // namespace aura_shell 192 } // namespace aura_shell
OLDNEW
« no previous file with comments | « ui/aura_shell/launcher/launcher_view.cc ('k') | ui/aura_shell/modal_container_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698