| OLD | NEW |
| 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/system/user/tray_user.h" | 5 #include "ash/system/user/tray_user.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <climits> | 8 #include <climits> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 957 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 968 params.type = views::Widget::InitParams::TYPE_TOOLTIP; | 968 params.type = views::Widget::InitParams::TYPE_TOOLTIP; |
| 969 params.keep_on_top = true; | 969 params.keep_on_top = true; |
| 970 params.context = this->GetWidget()->GetNativeWindow(); | 970 params.context = this->GetWidget()->GetNativeWindow(); |
| 971 params.accept_events = true; | 971 params.accept_events = true; |
| 972 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; | 972 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
| 973 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; | 973 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; |
| 974 add_menu_option_->Init(params); | 974 add_menu_option_->Init(params); |
| 975 add_menu_option_->SetOpacity(0xFF); | 975 add_menu_option_->SetOpacity(0xFF); |
| 976 add_menu_option_->GetNativeWindow()->set_owned_by_parent(false); | 976 add_menu_option_->GetNativeWindow()->set_owned_by_parent(false); |
| 977 SetShadowType(add_menu_option_->GetNativeView(), | 977 SetShadowType(add_menu_option_->GetNativeView(), |
| 978 views::corewm::SHADOW_TYPE_NONE); | 978 wm::SHADOW_TYPE_NONE); |
| 979 | 979 |
| 980 // Position it below our user card. | 980 // Position it below our user card. |
| 981 gfx::Rect bounds = user_card_view_->GetBoundsInScreen(); | 981 gfx::Rect bounds = user_card_view_->GetBoundsInScreen(); |
| 982 bounds.set_y(bounds.y() + bounds.height()); | 982 bounds.set_y(bounds.y() + bounds.height()); |
| 983 add_menu_option_->SetBounds(bounds); | 983 add_menu_option_->SetBounds(bounds); |
| 984 | 984 |
| 985 // Show the content. | 985 // Show the content. |
| 986 AddUserView* add_user_view = new AddUserView( | 986 AddUserView* add_user_view = new AddUserView( |
| 987 static_cast<UserCard*>(user_card_view_), this); | 987 static_cast<UserCard*>(user_card_view_), this); |
| 988 add_menu_option_->SetContentsView(add_user_view); | 988 add_menu_option_->SetContentsView(add_user_view); |
| (...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1360 internal::GetRootWindowController( | 1360 internal::GetRootWindowController( |
| 1361 system_tray()->GetWidget()->GetNativeWindow()->GetRootWindow()); | 1361 system_tray()->GetWidget()->GetNativeWindow()->GetRootWindow()); |
| 1362 if (controller && controller->shelf()) { | 1362 if (controller && controller->shelf()) { |
| 1363 UpdateAfterShelfAlignmentChange( | 1363 UpdateAfterShelfAlignmentChange( |
| 1364 controller->GetShelfLayoutManager()->GetAlignment()); | 1364 controller->GetShelfLayoutManager()->GetAlignment()); |
| 1365 } | 1365 } |
| 1366 } | 1366 } |
| 1367 | 1367 |
| 1368 } // namespace internal | 1368 } // namespace internal |
| 1369 } // namespace ash | 1369 } // namespace ash |
| OLD | NEW |