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

Side by Side Diff: ash/system/chromeos/multi_user/user_switch_util.cc

Issue 800983006: Update {virtual,override,final} to follow C++11 style in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Workaround Created 5 years, 11 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/system/chromeos/multi_user/user_switch_util.h" 5 #include "ash/system/chromeos/multi_user/user_switch_util.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/chromeos/screen_security/screen_tray_item.h" 8 #include "ash/system/chromeos/screen_security/screen_tray_item.h"
9 #include "ash/system/tray/system_tray.h" 9 #include "ash/system/tray/system_tray.h"
10 #include "grit/ash_strings.h" 10 #include "grit/ash_strings.h"
(...skipping 14 matching lines...) Expand all
25 25
26 const int kPaddingToMessage = 30; 26 const int kPaddingToMessage = 30;
27 const int kInset = 40; 27 const int kInset = 40;
28 const int kTopInset = 10; 28 const int kTopInset = 10;
29 29
30 //////////////////////////////////////////////////////////////////////////////// 30 ////////////////////////////////////////////////////////////////////////////////
31 // Dialog for multi-profiles desktop casting warning. 31 // Dialog for multi-profiles desktop casting warning.
32 class DesktopCastingWarningView : public views::DialogDelegateView { 32 class DesktopCastingWarningView : public views::DialogDelegateView {
33 public: 33 public:
34 DesktopCastingWarningView(base::Callback<void()> on_accept); 34 DesktopCastingWarningView(base::Callback<void()> on_accept);
35 virtual ~DesktopCastingWarningView(); 35 ~DesktopCastingWarningView() override;
36 36
37 static void ShowDialog(const base::Callback<void()> on_accept); 37 static void ShowDialog(const base::Callback<void()> on_accept);
38 38
39 // views::DialogDelegate overrides. 39 // views::DialogDelegate overrides.
40 virtual bool Accept() override; 40 bool Accept() override;
41 virtual base::string16 GetDialogButtonLabel( 41 base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
42 ui::DialogButton button) const override; 42 bool IsDialogButtonEnabled(ui::DialogButton button) const override;
43 virtual bool IsDialogButtonEnabled(ui::DialogButton button) const override; 43 int GetDefaultDialogButton() const override;
44 virtual int GetDefaultDialogButton() const override;
45 44
46 // views::WidgetDelegate overrides. 45 // views::WidgetDelegate overrides.
47 virtual ui::ModalType GetModalType() const override; 46 ui::ModalType GetModalType() const override;
48 47
49 // views::View overrides. 48 // views::View overrides.
50 virtual gfx::Size GetPreferredSize() const override; 49 gfx::Size GetPreferredSize() const override;
51 50
52 private: 51 private:
53 void InitDialog(); 52 void InitDialog();
54 53
55 const base::Callback<void()> on_switch_; 54 const base::Callback<void()> on_switch_;
56 55
57 DISALLOW_COPY_AND_ASSIGN(DesktopCastingWarningView); 56 DISALLOW_COPY_AND_ASSIGN(DesktopCastingWarningView);
58 }; 57 };
59 58
60 // The current instance of the running dialog - or NULL. This is used for 59 // The current instance of the running dialog - or NULL. This is used for
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 if (!instance_for_test) 189 if (!instance_for_test)
191 return false; 190 return false;
192 if (accept) 191 if (accept)
193 instance_for_test->Accept(); 192 instance_for_test->Accept();
194 delete instance_for_test->GetWidget()->GetNativeWindow(); 193 delete instance_for_test->GetWidget()->GetNativeWindow();
195 CHECK(!instance_for_test); 194 CHECK(!instance_for_test);
196 return true; 195 return true;
197 } 196 }
198 197
199 } // namespace chromeos 198 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/system/chromeos/label_tray_view.h ('k') | ash/system/chromeos/multi_user/user_switch_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698