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

Side by Side Diff: ash/test/ash_test_views_delegate.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « ash/test/ash_test_helper_unittest.cc ('k') | ash/test/child_modal_window.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 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 #ifndef ASH_TEST_ASH_TEST_VIEWS_DELEGATE_H_ 5 #ifndef ASH_TEST_ASH_TEST_VIEWS_DELEGATE_H_
6 #define ASH_TEST_ASH_TEST_VIEWS_DELEGATE_H_ 6 #define ASH_TEST_ASH_TEST_VIEWS_DELEGATE_H_
7 7
8 #include "ui/views/test/test_views_delegate.h" 8 #include "ui/views/test/test_views_delegate.h"
9 9
10 namespace ash { 10 namespace ash {
11 namespace test { 11 namespace test {
12 12
13 // Ash specific ViewsDelegate. In addition to creating a TestWebContents this 13 // Ash specific ViewsDelegate. In addition to creating a TestWebContents this
14 // parents widget with no parent/context to the shell. This is created by 14 // parents widget with no parent/context to the shell. This is created by
15 // default AshTestHelper. 15 // default AshTestHelper.
16 class AshTestViewsDelegate : public views::TestViewsDelegate { 16 class AshTestViewsDelegate : public views::TestViewsDelegate {
17 public: 17 public:
18 AshTestViewsDelegate(); 18 AshTestViewsDelegate();
19 virtual ~AshTestViewsDelegate(); 19 virtual ~AshTestViewsDelegate();
20 20
21 // Overriden from TestViewsDelegate. 21 // Overriden from TestViewsDelegate.
22 virtual content::WebContents* CreateWebContents( 22 virtual content::WebContents* CreateWebContents(
23 content::BrowserContext* browser_context, 23 content::BrowserContext* browser_context,
24 content::SiteInstance* site_instance) OVERRIDE; 24 content::SiteInstance* site_instance) override;
25 virtual void OnBeforeWidgetInit( 25 virtual void OnBeforeWidgetInit(
26 views::Widget::InitParams* params, 26 views::Widget::InitParams* params,
27 views::internal::NativeWidgetDelegate* delegate) OVERRIDE; 27 views::internal::NativeWidgetDelegate* delegate) override;
28 28
29 private: 29 private:
30 DISALLOW_COPY_AND_ASSIGN(AshTestViewsDelegate); 30 DISALLOW_COPY_AND_ASSIGN(AshTestViewsDelegate);
31 }; 31 };
32 32
33 } // namespace test 33 } // namespace test
34 } // namespace ash 34 } // namespace ash
35 35
36 #endif // ASH_TEST_ASH_TEST_VIEWS_DELEGATE_H_ 36 #endif // ASH_TEST_ASH_TEST_VIEWS_DELEGATE_H_
37 37
OLDNEW
« no previous file with comments | « ash/test/ash_test_helper_unittest.cc ('k') | ash/test/child_modal_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698