OLD | NEW |
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/desktop_background_view.h" | 5 #include "ui/aura_shell/desktop_background_view.h" |
6 | 6 |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "grit/ui_resources.h" | 8 #include "grit/ui_resources.h" |
9 #include "ui/aura/desktop.h" | 9 #include "ui/aura/desktop.h" |
10 #include "ui/aura_shell/aura_shell_export.h" | 10 #include "ui/aura_shell/aura_shell_export.h" |
(...skipping 27 matching lines...) Expand all Loading... |
38 bool DesktopBackgroundView::OnMousePressed(const views::MouseEvent& event) { | 38 bool DesktopBackgroundView::OnMousePressed(const views::MouseEvent& event) { |
39 return true; | 39 return true; |
40 } | 40 } |
41 | 41 |
42 void DesktopBackgroundView::OnMouseReleased(const views::MouseEvent& event) { | 42 void DesktopBackgroundView::OnMouseReleased(const views::MouseEvent& event) { |
43 Shell::GetInstance()->ToggleOverview(); | 43 Shell::GetInstance()->ToggleOverview(); |
44 } | 44 } |
45 | 45 |
46 views::Widget* CreateDesktopBackground() { | 46 views::Widget* CreateDesktopBackground() { |
47 views::Widget* desktop_widget = new views::Widget; | 47 views::Widget* desktop_widget = new views::Widget; |
48 views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL); | 48 views::Widget::InitParams params( |
49 params.parent = Shell::GetInstance()->GetContainer( | 49 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); |
50 aura_shell::internal::kShellWindowId_DesktopBackgroundContainer); | |
51 DesktopBackgroundView* view = new DesktopBackgroundView; | 50 DesktopBackgroundView* view = new DesktopBackgroundView; |
52 params.delegate = view; | 51 params.delegate = view; |
53 desktop_widget->Init(params); | 52 desktop_widget->Init(params); |
| 53 Shell::GetInstance()->GetContainer( |
| 54 aura_shell::internal::kShellWindowId_DesktopBackgroundContainer)-> |
| 55 AddChild(desktop_widget->GetNativeView()); |
54 desktop_widget->SetContentsView(view); | 56 desktop_widget->SetContentsView(view); |
55 desktop_widget->Show(); | 57 desktop_widget->Show(); |
56 desktop_widget->GetNativeView()->set_name("DesktopBackgroundView"); | 58 desktop_widget->GetNativeView()->set_name("DesktopBackgroundView"); |
57 return desktop_widget; | 59 return desktop_widget; |
58 } | 60 } |
59 | 61 |
60 } // namespace internal | 62 } // namespace internal |
61 } // namespace aura_shell | 63 } // namespace aura_shell |
OLD | NEW |