| 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/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 "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/text_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" |
| 17 #include "ui/views/widget/widget_delegate.h" | 17 #include "ui/views/widget/widget_delegate.h" |
| 18 | 18 |
| 19 using ash::Shell; | 19 using ash::Shell; |
| 20 | 20 |
| 21 namespace ash { | 21 namespace ash { |
| 22 namespace shell { | 22 namespace shell { |
| 23 | 23 |
| 24 class LockView : public views::WidgetDelegateView, | 24 class LockView : public views::WidgetDelegateView, |
| 25 public views::ButtonListener { | 25 public views::ButtonListener { |
| 26 public: | 26 public: |
| 27 LockView() : unlock_button_(ALLOW_THIS_IN_INITIALIZER_LIST( | 27 LockView() : unlock_button_(ALLOW_THIS_IN_INITIALIZER_LIST( |
| 28 new views::NativeTextButton(this, ASCIIToUTF16("Unlock")))) { | 28 new views::LabelButton(this, ASCIIToUTF16("Unlock")))) { |
| 29 unlock_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON); |
| 29 AddChildView(unlock_button_); | 30 AddChildView(unlock_button_); |
| 30 unlock_button_->set_focusable(true); | 31 unlock_button_->set_focusable(true); |
| 31 } | 32 } |
| 32 virtual ~LockView() {} | 33 virtual ~LockView() {} |
| 33 | 34 |
| 34 // Overridden from views::View: | 35 // Overridden from views::View: |
| 35 virtual gfx::Size GetPreferredSize() OVERRIDE { | 36 virtual gfx::Size GetPreferredSize() OVERRIDE { |
| 36 return gfx::Size(500, 400); | 37 return gfx::Size(500, 400); |
| 37 } | 38 } |
| 38 | 39 |
| (...skipping 28 matching lines...) Expand all Loading... |
| 67 } | 68 } |
| 68 | 69 |
| 69 // Overridden from views::ButtonListener: | 70 // Overridden from views::ButtonListener: |
| 70 virtual void ButtonPressed(views::Button* sender, | 71 virtual void ButtonPressed(views::Button* sender, |
| 71 const ui::Event& event) OVERRIDE { | 72 const ui::Event& event) OVERRIDE { |
| 72 DCHECK(sender == unlock_button_); | 73 DCHECK(sender == unlock_button_); |
| 73 GetWidget()->Close(); | 74 GetWidget()->Close(); |
| 74 } | 75 } |
| 75 | 76 |
| 76 gfx::Font font_; | 77 gfx::Font font_; |
| 77 views::NativeTextButton* unlock_button_; | 78 views::LabelButton* unlock_button_; |
| 78 | 79 |
| 79 DISALLOW_COPY_AND_ASSIGN(LockView); | 80 DISALLOW_COPY_AND_ASSIGN(LockView); |
| 80 }; | 81 }; |
| 81 | 82 |
| 82 void CreateLockScreen() { | 83 void CreateLockScreen() { |
| 83 LockView* lock_view = new LockView; | 84 LockView* lock_view = new LockView; |
| 84 views::Widget* widget = new views::Widget; | 85 views::Widget* widget = new views::Widget; |
| 85 views::Widget::InitParams params( | 86 views::Widget::InitParams params( |
| 86 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); | 87 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); |
| 87 gfx::Size ps = lock_view->GetPreferredSize(); | 88 gfx::Size ps = lock_view->GetPreferredSize(); |
| (...skipping 12 matching lines...) Expand all Loading... |
| 100 widget->GetNativeView()->SetName("LockView"); | 101 widget->GetNativeView()->SetName("LockView"); |
| 101 widget->GetNativeView()->Focus(); | 102 widget->GetNativeView()->Focus(); |
| 102 | 103 |
| 103 // TODO: it shouldn't be necessary to invoke UpdateTooltip() here. | 104 // TODO: it shouldn't be necessary to invoke UpdateTooltip() here. |
| 104 Shell::GetInstance()->tooltip_controller()->UpdateTooltip( | 105 Shell::GetInstance()->tooltip_controller()->UpdateTooltip( |
| 105 widget->GetNativeView()); | 106 widget->GetNativeView()); |
| 106 } | 107 } |
| 107 | 108 |
| 108 } // namespace shell | 109 } // namespace shell |
| 109 } // namespace ash | 110 } // namespace ash |
| OLD | NEW |