| OLD | NEW |
| 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 "ash/system/user/user_view.h" | 5 #include "ash/system/user/user_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "ash/multi_profile_uma.h" | 10 #include "ash/multi_profile_uma.h" |
| (...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 430 views::Widget::InitParams params; | 430 views::Widget::InitParams params; |
| 431 params.type = views::Widget::InitParams::TYPE_TOOLTIP; | 431 params.type = views::Widget::InitParams::TYPE_TOOLTIP; |
| 432 params.keep_on_top = true; | 432 params.keep_on_top = true; |
| 433 params.context = this->GetWidget()->GetNativeWindow(); | 433 params.context = this->GetWidget()->GetNativeWindow(); |
| 434 params.accept_events = true; | 434 params.accept_events = true; |
| 435 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; | 435 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
| 436 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; | 436 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; |
| 437 add_menu_option_->Init(params); | 437 add_menu_option_->Init(params); |
| 438 add_menu_option_->SetOpacity(0xFF); | 438 add_menu_option_->SetOpacity(0xFF); |
| 439 add_menu_option_->GetNativeWindow()->set_owned_by_parent(false); | 439 add_menu_option_->GetNativeWindow()->set_owned_by_parent(false); |
| 440 SetShadowType(add_menu_option_->GetNativeView(), wm::SHADOW_TYPE_NONE); | 440 SetShadowType(add_menu_option_->GetNativeView(), ::wm::SHADOW_TYPE_NONE); |
| 441 | 441 |
| 442 // Position it below our user card. | 442 // Position it below our user card. |
| 443 gfx::Rect bounds = user_card_view_->GetBoundsInScreen(); | 443 gfx::Rect bounds = user_card_view_->GetBoundsInScreen(); |
| 444 bounds.set_y(bounds.y() + bounds.height()); | 444 bounds.set_y(bounds.y() + bounds.height()); |
| 445 add_menu_option_->SetBounds(bounds); | 445 add_menu_option_->SetBounds(bounds); |
| 446 | 446 |
| 447 // Show the content. | 447 // Show the content. |
| 448 add_menu_option_->SetAlwaysOnTop(true); | 448 add_menu_option_->SetAlwaysOnTop(true); |
| 449 add_menu_option_->Show(); | 449 add_menu_option_->Show(); |
| 450 | 450 |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 520 focus_manager_ = NULL; | 520 focus_manager_ = NULL; |
| 521 if (user_card_view_->GetFocusManager()) | 521 if (user_card_view_->GetFocusManager()) |
| 522 user_card_view_->GetFocusManager()->ClearFocus(); | 522 user_card_view_->GetFocusManager()->ClearFocus(); |
| 523 popup_message_.reset(); | 523 popup_message_.reset(); |
| 524 mouse_watcher_.reset(); | 524 mouse_watcher_.reset(); |
| 525 add_menu_option_.reset(); | 525 add_menu_option_.reset(); |
| 526 } | 526 } |
| 527 | 527 |
| 528 } // namespace tray | 528 } // namespace tray |
| 529 } // namespace ash | 529 } // namespace ash |
| OLD | NEW |