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

Side by Side Diff: chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.cc

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 years, 2 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 "chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.h" 5 #include "chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "chrome/grit/generated_resources.h" 8 #include "chrome/grit/generated_resources.h"
9 #include "ui/base/l10n/l10n_util.h" 9 #include "ui/base/l10n/l10n_util.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
(...skipping 19 matching lines...) Expand all
30 //////////////////////////////////////////////////////////////////////////////// 30 ////////////////////////////////////////////////////////////////////////////////
31 // Dialog for multi-profiles introduction. 31 // Dialog for multi-profiles introduction.
32 class MultiprofilesIntroView : public views::DialogDelegateView { 32 class MultiprofilesIntroView : public views::DialogDelegateView {
33 public: 33 public:
34 explicit MultiprofilesIntroView(const base::Callback<void(bool)> on_accept); 34 explicit MultiprofilesIntroView(const base::Callback<void(bool)> on_accept);
35 virtual ~MultiprofilesIntroView(); 35 virtual ~MultiprofilesIntroView();
36 36
37 static void ShowDialog(const base::Callback<void(bool)> on_accept); 37 static void ShowDialog(const base::Callback<void(bool)> on_accept);
38 38
39 // views::DialogDelegate overrides. 39 // views::DialogDelegate overrides.
40 virtual bool Accept() OVERRIDE; 40 virtual bool Accept() override;
41 41
42 // views::WidgetDelegate overrides. 42 // views::WidgetDelegate overrides.
43 virtual ui::ModalType GetModalType() const OVERRIDE; 43 virtual ui::ModalType GetModalType() const override;
44 44
45 // views::View overrides. 45 // views::View overrides.
46 virtual gfx::Size GetPreferredSize() const OVERRIDE; 46 virtual gfx::Size GetPreferredSize() const override;
47 47
48 private: 48 private:
49 void InitDialog(); 49 void InitDialog();
50 50
51 scoped_ptr<views::Checkbox> no_show_checkbox_; 51 scoped_ptr<views::Checkbox> no_show_checkbox_;
52 const base::Callback<void(bool)> on_accept_; 52 const base::Callback<void(bool)> on_accept_;
53 53
54 DISALLOW_COPY_AND_ASSIGN(MultiprofilesIntroView); 54 DISALLOW_COPY_AND_ASSIGN(MultiprofilesIntroView);
55 }; 55 };
56 56
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 } // namespace 153 } // namespace
154 154
155 //////////////////////////////////////////////////////////////////////////////// 155 ////////////////////////////////////////////////////////////////////////////////
156 // Factory function. 156 // Factory function.
157 157
158 void ShowMultiprofilesIntroDialog(const base::Callback<void(bool)> on_accept) { 158 void ShowMultiprofilesIntroDialog(const base::Callback<void(bool)> on_accept) {
159 MultiprofilesIntroView::ShowDialog(on_accept); 159 MultiprofilesIntroView::ShowDialog(on_accept);
160 } 160 }
161 161
162 } // namespace chromeos 162 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698