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

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

Issue 14305026: ash: Remove use of ALLOW_THIS_IN_INITIALIZER_LIST. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « ash/shelf/background_animator.cc ('k') | ash/shell/window_type_launcher.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/session_state_delegate.h" 5 #include "ash/session_state_delegate.h"
6 #include "ash/shell.h" 6 #include "ash/shell.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"
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()
28 new views::LabelButton(this, ASCIIToUTF16("Unlock")))) { 28 : unlock_button_(new views::LabelButton(this, ASCIIToUTF16("Unlock"))) {
29 unlock_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON); 29 unlock_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
30 AddChildView(unlock_button_); 30 AddChildView(unlock_button_);
31 unlock_button_->set_focusable(true); 31 unlock_button_->set_focusable(true);
32 } 32 }
33 virtual ~LockView() {} 33 virtual ~LockView() {}
34 34
35 // Overridden from views::View: 35 // Overridden from views::View:
36 virtual gfx::Size GetPreferredSize() OVERRIDE { 36 virtual gfx::Size GetPreferredSize() OVERRIDE {
37 return gfx::Size(500, 400); 37 return gfx::Size(500, 400);
38 } 38 }
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/shelf/background_animator.cc ('k') | ash/shell/window_type_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698