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

Side by Side Diff: ash/shell/lock_view.cc

Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate (Closed)
Patch Set: rebase to get WorkspaceLayoutManagerSoloTest change Created 3 years, 9 months 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 | « ash/shell/example_session_controller_client.cc ('k') | ash/shell/shell_delegate_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 (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/common/session/session_state_delegate.h" 5 #include "ash/common/session/session_controller.h"
6 #include "ash/common/wm_shell.h" 6 #include "ash/common/wm_shell.h"
7 #include "ash/public/cpp/shell_window_ids.h" 7 #include "ash/public/cpp/shell_window_ids.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell/example_factory.h" 9 #include "ash/shell/example_factory.h"
10 #include "ash/shell/example_session_controller_client.h"
10 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
11 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
12 #include "ui/aura/window_event_dispatcher.h" 13 #include "ui/aura/window_event_dispatcher.h"
13 #include "ui/gfx/canvas.h" 14 #include "ui/gfx/canvas.h"
14 #include "ui/gfx/font_list.h" 15 #include "ui/gfx/font_list.h"
15 #include "ui/gfx/geometry/rect.h" 16 #include "ui/gfx/geometry/rect.h"
16 #include "ui/gfx/text_utils.h" 17 #include "ui/gfx/text_utils.h"
17 #include "ui/views/controls/button/md_text_button.h" 18 #include "ui/views/controls/button/md_text_button.h"
18 #include "ui/views/corewm/tooltip_controller.h" 19 #include "ui/views/corewm/tooltip_controller.h"
19 #include "ui/views/widget/widget.h" 20 #include "ui/views/widget/widget.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 unlock_button_->SetBoundsRect(bounds); 56 unlock_button_->SetBoundsRect(bounds);
56 } 57 }
57 void ViewHierarchyChanged( 58 void ViewHierarchyChanged(
58 const ViewHierarchyChangedDetails& details) override { 59 const ViewHierarchyChangedDetails& details) override {
59 if (details.is_add && details.child == this) 60 if (details.is_add && details.child == this)
60 unlock_button_->RequestFocus(); 61 unlock_button_->RequestFocus();
61 } 62 }
62 63
63 // Overridden from views::WidgetDelegateView: 64 // Overridden from views::WidgetDelegateView:
64 void WindowClosing() override { 65 void WindowClosing() override {
65 WmShell::Get()->GetSessionStateDelegate()->UnlockScreen(); 66 ExampleSessionControllerClient::Get()->UnlockScreen();
66 } 67 }
67 68
68 // Overridden from views::ButtonListener: 69 // Overridden from views::ButtonListener:
69 void ButtonPressed(views::Button* sender, const ui::Event& event) override { 70 void ButtonPressed(views::Button* sender, const ui::Event& event) override {
70 DCHECK(sender == unlock_button_); 71 DCHECK(sender == unlock_button_);
71 GetWidget()->Close(); 72 GetWidget()->Close();
72 } 73 }
73 74
74 gfx::FontList font_list_; 75 gfx::FontList font_list_;
75 views::Button* unlock_button_; 76 views::Button* unlock_button_;
(...skipping 20 matching lines...) Expand all
96 widget->GetNativeView()->SetName("LockView"); 97 widget->GetNativeView()->SetName("LockView");
97 widget->GetNativeView()->Focus(); 98 widget->GetNativeView()->Focus();
98 99
99 // TODO: it shouldn't be necessary to invoke UpdateTooltip() here. 100 // TODO: it shouldn't be necessary to invoke UpdateTooltip() here.
100 Shell::GetInstance()->tooltip_controller()->UpdateTooltip( 101 Shell::GetInstance()->tooltip_controller()->UpdateTooltip(
101 widget->GetNativeView()); 102 widget->GetNativeView());
102 } 103 }
103 104
104 } // namespace shell 105 } // namespace shell
105 } // namespace ash 106 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/example_session_controller_client.cc ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698