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

Side by Side Diff: chrome/browser/ui/find_bar/find_bar_state_factory.cc

Issue 15517005: Remove references to Profile from browser_context_keyed_service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase & style Created 7 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/find_bar/find_bar_state_factory.h" 5 #include "chrome/browser/ui/find_bar/find_bar_state_factory.h"
6 6
7 #include "chrome/browser/profiles/incognito_helpers.h" 7 #include "chrome/browser/profiles/incognito_helpers.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/find_bar/find_bar_state.h" 9 #include "chrome/browser/ui/find_bar/find_bar_state.h"
10 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h" 10 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"
11 11
12 // static 12 // static
13 FindBarState* FindBarStateFactory::GetForProfile(Profile* profile) { 13 FindBarState* FindBarStateFactory::GetForProfile(Profile* profile) {
14 return static_cast<FindBarState*>( 14 return static_cast<FindBarState*>(
15 GetInstance()->GetServiceForProfile(profile, true)); 15 GetInstance()->GetServiceForBrowserContext(profile, true));
16 } 16 }
17 17
18 // static 18 // static
19 string16 FindBarStateFactory::GetLastPrepopulateText(Profile* p) { 19 string16 FindBarStateFactory::GetLastPrepopulateText(Profile* p) {
20 FindBarState* state = GetForProfile(p); 20 FindBarState* state = GetForProfile(p);
21 string16 text = state->last_prepopulate_text(); 21 string16 text = state->last_prepopulate_text();
22 22
23 if (text.empty() && p->IsOffTheRecord()) { 23 if (text.empty() && p->IsOffTheRecord()) {
24 // Fall back to the original profile. 24 // Fall back to the original profile.
25 state = GetForProfile(p->GetOriginalProfile()); 25 state = GetForProfile(p->GetOriginalProfile());
26 text = state->last_prepopulate_text(); 26 text = state->last_prepopulate_text();
27 } 27 }
28 28
29 return text; 29 return text;
30 } 30 }
31 31
32 // static 32 // static
33 FindBarStateFactory* FindBarStateFactory::GetInstance() { 33 FindBarStateFactory* FindBarStateFactory::GetInstance() {
34 return Singleton<FindBarStateFactory>::get(); 34 return Singleton<FindBarStateFactory>::get();
35 } 35 }
36 36
37 FindBarStateFactory::FindBarStateFactory() 37 FindBarStateFactory::FindBarStateFactory()
38 : ProfileKeyedServiceFactory("FindBarState", 38 : BrowserContextKeyedServiceFactory(
39 ProfileDependencyManager::GetInstance()) { 39 "FindBarState",
40 BrowserContextDependencyManager::GetInstance()) {
40 } 41 }
41 42
42 FindBarStateFactory::~FindBarStateFactory() {} 43 FindBarStateFactory::~FindBarStateFactory() {}
43 44
44 ProfileKeyedService* FindBarStateFactory::BuildServiceInstanceFor( 45 BrowserContextKeyedService* FindBarStateFactory::BuildServiceInstanceFor(
45 content::BrowserContext* profile) const { 46 content::BrowserContext* profile) const {
46 return new FindBarState; 47 return new FindBarState;
47 } 48 }
48 49
49 content::BrowserContext* FindBarStateFactory::GetBrowserContextToUse( 50 content::BrowserContext* FindBarStateFactory::GetBrowserContextToUse(
50 content::BrowserContext* context) const { 51 content::BrowserContext* context) const {
51 return chrome::GetBrowserContextOwnInstanceInIncognito(context); 52 return chrome::GetBrowserContextOwnInstanceInIncognito(context);
52 } 53 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698