chrome/android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.h - Issue 644903002: Replacing the OVERRIDE with override and in chrome

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.h

Issue 644903002: Replacing the OVERRIDE with override and in chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Extrafile added 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

OLD	NEW
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 CHROME_ANDROID_SYNC_SHELL_CHROME_MAIN_DELEGATE_CHROME_SYNC_SHELL_ANDROID _H_	5 #ifndef CHROME_ANDROID_SYNC_SHELL_CHROME_MAIN_DELEGATE_CHROME_SYNC_SHELL_ANDROID _H_

6 #define CHROME_ANDROID_SYNC_SHELL_CHROME_MAIN_DELEGATE_CHROME_SYNC_SHELL_ANDROID _H_	6 #define CHROME_ANDROID_SYNC_SHELL_CHROME_MAIN_DELEGATE_CHROME_SYNC_SHELL_ANDROID _H_

7	7

8 #include "chrome/app/android/chrome_main_delegate_android.h"	8 #include "chrome/app/android/chrome_main_delegate_android.h"

9	9

10 class ChromeMainDelegateChromeSyncShellAndroid	10 class ChromeMainDelegateChromeSyncShellAndroid

11 : public ChromeMainDelegateAndroid {	11 : public ChromeMainDelegateAndroid {

12 public:	12 public:

13 ChromeMainDelegateChromeSyncShellAndroid();	13 ChromeMainDelegateChromeSyncShellAndroid();

14 virtual ~ChromeMainDelegateChromeSyncShellAndroid();	14 virtual ~ChromeMainDelegateChromeSyncShellAndroid();

15	15

16 virtual bool RegisterApplicationNativeMethods(JNIEnv* env) OVERRIDE;	16 virtual bool RegisterApplicationNativeMethods(JNIEnv* env) override;

17	17

18 virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;	18 virtual bool BasicStartupComplete(int* exit_code) override;

19	19

20 private:	20 private:

21 DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateChromeSyncShellAndroid);	21 DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateChromeSyncShellAndroid);

22 };	22 };

23	23

24 #endif // CHROME_ANDROID_SYNC_SHELL_CHROME_MAIN_DELEGATE_CHROME_SYNC_SHELL_ANDR OID_H_	24 #endif // CHROME_ANDROID_SYNC_SHELL_CHROME_MAIN_DELEGATE_CHROME_SYNC_SHELL_ANDR OID_H_

OLD	NEW