diff options
Diffstat (limited to 'ash/wm/panels')
| -rw-r--r-- | ash/wm/panels/panel_layout_manager.cc | 2 | ||||
| -rw-r--r-- | ash/wm/panels/panel_window_resizer_unittest.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc index 690c23a..9392303 100644 --- a/ash/wm/panels/panel_layout_manager.cc +++ b/ash/wm/panels/panel_layout_manager.cc @@ -545,7 +545,7 @@ void PanelLayoutManager::WillChangeVisibilityState( // PanelLayoutManager private implementation: void PanelLayoutManager::MinimizePanel(aura::Window* panel) { - ::wm::SetWindowVisibilityAnimationType( + views::corewm::SetWindowVisibilityAnimationType( panel, WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE); ui::Layer* layer = panel->layer(); ui::ScopedLayerAnimationSettings panel_slide_settings(layer->GetAnimator()); diff --git a/ash/wm/panels/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc index 4debaed..74329f0 100644 --- a/ash/wm/panels/panel_window_resizer_unittest.cc +++ b/ash/wm/panels/panel_window_resizer_unittest.cc @@ -508,10 +508,10 @@ TEST_P(PanelWindowResizerTransientTest, PanelWithTransientChild) { scoped_ptr<aura::Window> window(CreatePanelWindow(gfx::Point(0, 0))); scoped_ptr<aura::Window> child(CreateTestWindowInShellWithDelegateAndType( NULL, transient_window_type_, 0, gfx::Rect(20, 20, 150, 40))); - ::wm::AddTransientChild(window.get(), child.get()); + views::corewm::AddTransientChild(window.get(), child.get()); if (window->parent() != child->parent()) window->parent()->AddChild(child.get()); - EXPECT_EQ(window.get(), ::wm::GetTransientParent(child.get())); + EXPECT_EQ(window.get(), views::corewm::GetTransientParent(child.get())); // Drag the child to the shelf. Its new position should not be overridden. const gfx::Rect attached_bounds(window->GetBoundsInScreen()); |