chrome/browser/ui/app_list/app_list_prefs_factory.h - Issue 648133002: fix newly added OVERRIDEs in chrome/browser/ui/

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/browser/ui/app_list/app_list_prefs_factory.h

Issue 648133002: fix newly added OVERRIDEs in chrome/browser/ui/ (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 | « no previous file | chrome/browser/ui/app_list/model_pref_updater.h » ('j') | no next file with comments »

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_BROWSER_UI_APP_LIST_APP_LIST_PREFS_FACTORY_H_	5 #ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_PREFS_FACTORY_H_

6 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_PREFS_FACTORY_H_	6 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_PREFS_FACTORY_H_

7	7

8 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

9 #include "base/memory/singleton.h"	9 #include "base/memory/singleton.h"

10 #include "components/keyed_service/content/browser_context_keyed_service_factory .h"	10 #include "components/keyed_service/content/browser_context_keyed_service_factory .h"

(...skipping 11 matching lines...) Expand all Loading...
22 void SetInstanceForTesting(content::BrowserContext* context,	22 void SetInstanceForTesting(content::BrowserContext* context,

23 AppListPrefs* prefs);	23 AppListPrefs* prefs);

24	24

25 private:	25 private:

26 friend struct DefaultSingletonTraits<AppListPrefsFactory>;	26 friend struct DefaultSingletonTraits<AppListPrefsFactory>;

27	27

28 AppListPrefsFactory();	28 AppListPrefsFactory();

29 virtual ~AppListPrefsFactory();	29 virtual ~AppListPrefsFactory();

30	30

31 virtual KeyedService* BuildServiceInstanceFor(	31 virtual KeyedService* BuildServiceInstanceFor(

32 content::BrowserContext* context) const OVERRIDE;	32 content::BrowserContext* context) const override;

33 virtual content::BrowserContext* GetBrowserContextToUse(	33 virtual content::BrowserContext* GetBrowserContextToUse(

34 content::BrowserContext* context) const OVERRIDE;	34 content::BrowserContext* context) const override;

35 };	35 };

36	36

37 } // namespace app_list	37 } // namespace app_list

38	38

39 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_PREFS_FACTORY_H_	39 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_PREFS_FACTORY_H_

OLD	NEW