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

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

Issue 14295008: Add ash SessionStateDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 7 years, 8 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/app_list.cc ('k') | ash/shell/shell_delegate_impl.h » ('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/session_state_delegate.h"
5 #include "ash/shell.h" 6 #include "ash/shell.h"
6 #include "ash/shell_delegate.h"
7 #include "ash/shell_window_ids.h" 7 #include "ash/shell_window_ids.h"
8 #include "ash/shell/example_factory.h" 8 #include "ash/shell/example_factory.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "ui/aura/root_window.h" 10 #include "ui/aura/root_window.h"
11 #include "ui/aura/window.h" 11 #include "ui/aura/window.h"
12 #include "ui/gfx/canvas.h" 12 #include "ui/gfx/canvas.h"
13 #include "ui/gfx/font.h" 13 #include "ui/gfx/font.h"
14 #include "ui/views/controls/button/label_button.h" 14 #include "ui/views/controls/button/label_button.h"
15 #include "ui/views/corewm/tooltip_controller.h" 15 #include "ui/views/corewm/tooltip_controller.h"
16 #include "ui/views/widget/widget.h" 16 #include "ui/views/widget/widget.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 } 57 }
58 virtual void ViewHierarchyChanged(bool is_add, 58 virtual void ViewHierarchyChanged(bool is_add,
59 views::View* parent, 59 views::View* parent,
60 views::View* child) OVERRIDE { 60 views::View* child) OVERRIDE {
61 if (is_add && child == this) 61 if (is_add && child == this)
62 unlock_button_->RequestFocus(); 62 unlock_button_->RequestFocus();
63 } 63 }
64 64
65 // Overridden from views::WidgetDelegateView: 65 // Overridden from views::WidgetDelegateView:
66 virtual void WindowClosing() OVERRIDE { 66 virtual void WindowClosing() OVERRIDE {
67 Shell::GetInstance()->delegate()->UnlockScreen(); 67 Shell::GetInstance()->session_state_delegate()->UnlockScreen();
68 } 68 }
69 69
70 // Overridden from views::ButtonListener: 70 // Overridden from views::ButtonListener:
71 virtual void ButtonPressed(views::Button* sender, 71 virtual void ButtonPressed(views::Button* sender,
72 const ui::Event& event) OVERRIDE { 72 const ui::Event& event) OVERRIDE {
73 DCHECK(sender == unlock_button_); 73 DCHECK(sender == unlock_button_);
74 GetWidget()->Close(); 74 GetWidget()->Close();
75 } 75 }
76 76
77 gfx::Font font_; 77 gfx::Font font_;
(...skipping 23 matching lines...) Expand all
101 widget->GetNativeView()->SetName("LockView"); 101 widget->GetNativeView()->SetName("LockView");
102 widget->GetNativeView()->Focus(); 102 widget->GetNativeView()->Focus();
103 103
104 // TODO: it shouldn't be necessary to invoke UpdateTooltip() here. 104 // TODO: it shouldn't be necessary to invoke UpdateTooltip() here.
105 Shell::GetInstance()->tooltip_controller()->UpdateTooltip( 105 Shell::GetInstance()->tooltip_controller()->UpdateTooltip(
106 widget->GetNativeView()); 106 widget->GetNativeView());
107 } 107 }
108 108
109 } // namespace shell 109 } // namespace shell
110 } // namespace ash 110 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/app_list.cc ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698