| OLD | NEW |
| 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/keyed_service/content/browser_context_dependency_manager.h" | 10 #include "components/keyed_service/content/browser_context_dependency_manager.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 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 base::Singleton<FindBarStateFactory>::get(); |
| 35 } | 35 } |
| 36 | 36 |
| 37 FindBarStateFactory::FindBarStateFactory() | 37 FindBarStateFactory::FindBarStateFactory() |
| 38 : BrowserContextKeyedServiceFactory( | 38 : BrowserContextKeyedServiceFactory( |
| 39 "FindBarState", | 39 "FindBarState", |
| 40 BrowserContextDependencyManager::GetInstance()) { | 40 BrowserContextDependencyManager::GetInstance()) { |
| 41 } | 41 } |
| 42 | 42 |
| 43 FindBarStateFactory::~FindBarStateFactory() {} | 43 FindBarStateFactory::~FindBarStateFactory() {} |
| 44 | 44 |
| 45 KeyedService* FindBarStateFactory::BuildServiceInstanceFor( | 45 KeyedService* FindBarStateFactory::BuildServiceInstanceFor( |
| 46 content::BrowserContext* profile) const { | 46 content::BrowserContext* profile) const { |
| 47 return new FindBarState; | 47 return new FindBarState; |
| 48 } | 48 } |
| 49 | 49 |
| 50 content::BrowserContext* FindBarStateFactory::GetBrowserContextToUse( | 50 content::BrowserContext* FindBarStateFactory::GetBrowserContextToUse( |
| 51 content::BrowserContext* context) const { | 51 content::BrowserContext* context) const { |
| 52 return chrome::GetBrowserContextOwnInstanceInIncognito(context); | 52 return chrome::GetBrowserContextOwnInstanceInIncognito(context); |
| 53 } | 53 } |
| OLD | NEW |