OLD | NEW |
1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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 #import "ios/chrome/browser/tabs/tab_model_list.h" | 5 #import "ios/chrome/browser/tabs/tab_model_list.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/memory/ptr_util.h" |
9 #include "base/supports_user_data.h" | 10 #include "base/supports_user_data.h" |
10 #include "ios/chrome/browser/application_context.h" | 11 #include "ios/chrome/browser/application_context.h" |
11 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" | 12 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" |
12 #include "ios/chrome/browser/browser_state/chrome_browser_state_manager.h" | 13 #include "ios/chrome/browser/browser_state/chrome_browser_state_manager.h" |
13 #import "ios/chrome/browser/tabs/tab_model.h" | 14 #import "ios/chrome/browser/tabs/tab_model.h" |
14 | 15 |
15 #if !defined(__has_feature) || !__has_feature(objc_arc) | 16 #if !defined(__has_feature) || !__has_feature(objc_arc) |
16 #error "This file requires ARC support." | 17 #error "This file requires ARC support." |
17 #endif | 18 #endif |
18 | 19 |
(...skipping 28 matching lines...) Expand all Loading... |
47 DCHECK_EQ([tab_models_ count], 0u); | 48 DCHECK_EQ([tab_models_ count], 0u); |
48 } | 49 } |
49 | 50 |
50 // static | 51 // static |
51 TabModelList* TabModelList::GetForBrowserState( | 52 TabModelList* TabModelList::GetForBrowserState( |
52 ios::ChromeBrowserState* browser_state, | 53 ios::ChromeBrowserState* browser_state, |
53 bool create) { | 54 bool create) { |
54 TabModelList* tab_model_list = | 55 TabModelList* tab_model_list = |
55 static_cast<TabModelList*>(browser_state->GetUserData(&kTabModelListKey)); | 56 static_cast<TabModelList*>(browser_state->GetUserData(&kTabModelListKey)); |
56 if (!tab_model_list && create) { | 57 if (!tab_model_list && create) { |
57 // The ownership of TabModelList is transfered to base::SupportsUserData | |
58 // via the SetUserData call (should take a std::unique_ptr<>). | |
59 tab_model_list = new TabModelList; | 58 tab_model_list = new TabModelList; |
60 browser_state->SetUserData(&kTabModelListKey, tab_model_list); | 59 browser_state->SetUserData(&kTabModelListKey, |
| 60 base::WrapUnique(tab_model_list)); |
61 } | 61 } |
62 return tab_model_list; | 62 return tab_model_list; |
63 } | 63 } |
64 } // namespace | 64 } // namespace |
65 | 65 |
66 void RegisterTabModelWithChromeBrowserState( | 66 void RegisterTabModelWithChromeBrowserState( |
67 ios::ChromeBrowserState* browser_state, | 67 ios::ChromeBrowserState* browser_state, |
68 TabModel* tab_model) { | 68 TabModel* tab_model) { |
69 NSMutableSet<TabModel*>* tab_models = | 69 NSMutableSet<TabModel*>* tab_models = |
70 TabModelList::GetForBrowserState(browser_state, true)->tab_models(); | 70 TabModelList::GetForBrowserState(browser_state, true)->tab_models(); |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 continue; | 122 continue; |
123 | 123 |
124 for (TabModel* tab_model in tab_model_list->tab_models()) { | 124 for (TabModel* tab_model in tab_model_list->tab_models()) { |
125 if (![tab_model isEmpty]) | 125 if (![tab_model isEmpty]) |
126 return true; | 126 return true; |
127 } | 127 } |
128 } | 128 } |
129 | 129 |
130 return false; | 130 return false; |
131 } | 131 } |
OLD | NEW |