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

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

Issue 10827271: Replace views::Event with ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « ash/launcher/launcher_view.cc ('k') | ash/shell/window_type_launcher.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/shell.h" 5 #include "ash/shell.h"
6 #include "ash/shell_delegate.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 "ash/tooltips/tooltip_controller.h" 9 #include "ash/tooltips/tooltip_controller.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 unlock_button_->RequestFocus(); 61 unlock_button_->RequestFocus();
62 } 62 }
63 63
64 // Overridden from views::WidgetDelegateView: 64 // Overridden from views::WidgetDelegateView:
65 virtual void WindowClosing() OVERRIDE { 65 virtual void WindowClosing() OVERRIDE {
66 Shell::GetInstance()->delegate()->UnlockScreen(); 66 Shell::GetInstance()->delegate()->UnlockScreen();
67 } 67 }
68 68
69 // Overridden from views::ButtonListener: 69 // Overridden from views::ButtonListener:
70 virtual void ButtonPressed(views::Button* sender, 70 virtual void ButtonPressed(views::Button* sender,
71 const views::Event& event) OVERRIDE { 71 const ui::Event& event) OVERRIDE {
72 DCHECK(sender == unlock_button_); 72 DCHECK(sender == unlock_button_);
73 GetWidget()->Close(); 73 GetWidget()->Close();
74 } 74 }
75 75
76 gfx::Font font_; 76 gfx::Font font_;
77 views::NativeTextButton* unlock_button_; 77 views::NativeTextButton* unlock_button_;
78 78
79 DISALLOW_COPY_AND_ASSIGN(LockView); 79 DISALLOW_COPY_AND_ASSIGN(LockView);
80 }; 80 };
81 81
(...skipping 17 matching lines...) Expand all
99 widget->Show(); 99 widget->Show();
100 widget->GetNativeView()->SetName("LockView"); 100 widget->GetNativeView()->SetName("LockView");
101 widget->GetNativeView()->Focus(); 101 widget->GetNativeView()->Focus();
102 102
103 Shell::GetInstance()->tooltip_controller()->UpdateTooltip( 103 Shell::GetInstance()->tooltip_controller()->UpdateTooltip(
104 widget->GetNativeView()); 104 widget->GetNativeView());
105 } 105 }
106 106
107 } // namespace shell 107 } // namespace shell
108 } // namespace ash 108 } // namespace ash
OLDNEW
« no previous file with comments | « ash/launcher/launcher_view.cc ('k') | ash/shell/window_type_launcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698