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

Side by Side Diff: chrome/browser/chromeos/login/ui/lock_window_aura.cc

Issue 693523003: MacViews: Put wm window animation calls behind an interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@views-clipboard
Patch Set: Fix windows build Created 6 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/ui/login_display_host_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/chromeos/login/ui/lock_window_aura.h" 5 #include "chrome/browser/chromeos/login/ui/lock_window_aura.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/wm/window_animations.h"
10 #include "base/command_line.h" 9 #include "base/command_line.h"
11 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
12 #include "ui/aura/window_event_dispatcher.h" 11 #include "ui/aura/window_event_dispatcher.h"
13 12
14 #if defined(USE_ATHENA) 13 #if defined(USE_ATHENA)
15 #include "athena/screen/public/screen_manager.h" 14 #include "athena/screen/public/screen_manager.h"
16 #include "athena/util/container_priorities.h" 15 #include "athena/util/container_priorities.h"
17 #include "athena/util/fill_layout_manager.h" 16 #include "athena/util/fill_layout_manager.h"
18 #endif 17 #endif
19 18
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 lock_screen_container_->SetLayoutManager( 78 lock_screen_container_->SetLayoutManager(
80 new athena::FillLayoutManager(lock_screen_container_.get())); 79 new athena::FillLayoutManager(lock_screen_container_.get()));
81 #else 80 #else
82 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; 81 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
83 // TODO(oshima): move the lock screen harness to ash. 82 // TODO(oshima): move the lock screen harness to ash.
84 params.parent = 83 params.parent =
85 ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(), 84 ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
86 ash::kShellWindowId_LockScreenContainer); 85 ash::kShellWindowId_LockScreenContainer);
87 #endif 86 #endif
88 views::Widget::Init(params); 87 views::Widget::Init(params);
89 wm::SetWindowVisibilityAnimationTransition( 88 SetVisibilityAnimationTransition(views::Widget::ANIMATE_NONE);
90 GetNativeView(), wm::ANIMATE_NONE);
91 } 89 }
92 90
93 } // namespace chromeos 91 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/ui/login_display_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698