| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ | 5 #ifndef CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ |
| 6 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ | 6 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 WebIntentPickerController* web_intent_picker_controller() { | 184 WebIntentPickerController* web_intent_picker_controller() { |
| 185 return web_intent_picker_controller_.get(); | 185 return web_intent_picker_controller_.get(); |
| 186 } | 186 } |
| 187 | 187 |
| 188 // Overrides ----------------------------------------------------------------- | 188 // Overrides ----------------------------------------------------------------- |
| 189 | 189 |
| 190 // content::WebContentsObserver overrides: | 190 // content::WebContentsObserver overrides: |
| 191 virtual void WebContentsDestroyed(content::WebContents* tab) OVERRIDE; | 191 virtual void WebContentsDestroyed(content::WebContents* tab) OVERRIDE; |
| 192 | 192 |
| 193 private: | 193 private: |
| 194 FRIEND_TEST_ALL_PREFIXES( | 194 friend class PrefsTabHelperTest; |
| 195 PrefsTabHelperTest, OverridePrefsOnViewCreation); | |
| 196 | 195 |
| 197 // Used to retrieve this object from |tab_contents_|, which is placed in | 196 // Used to retrieve this object from |tab_contents_|, which is placed in |
| 198 // its property bag to avoid adding additional interfaces. | 197 // its property bag to avoid adding additional interfaces. |
| 199 static base::PropertyAccessor<TabContentsWrapper*>* property_accessor(); | 198 static base::PropertyAccessor<TabContentsWrapper*>* property_accessor(); |
| 200 | 199 |
| 201 // Tab Helpers --------------------------------------------------------------- | 200 // Tab Helpers --------------------------------------------------------------- |
| 202 // (These provide API for callers and have a getter function listed in the | 201 // (These provide API for callers and have a getter function listed in the |
| 203 // "Tab Helpers" section in the member functions area, above.) | 202 // "Tab Helpers" section in the member functions area, above.) |
| 204 | 203 |
| 205 scoped_ptr<AutocompleteHistoryManager> autocomplete_history_manager_; | 204 scoped_ptr<AutocompleteHistoryManager> autocomplete_history_manager_; |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 | 266 |
| 268 // The supporting objects need to outlive the TabContents dtor (as they may | 267 // The supporting objects need to outlive the TabContents dtor (as they may |
| 269 // be called upon during its execution). As a result, this must come last | 268 // be called upon during its execution). As a result, this must come last |
| 270 // in the list. | 269 // in the list. |
| 271 scoped_ptr<TabContents> tab_contents_; | 270 scoped_ptr<TabContents> tab_contents_; |
| 272 | 271 |
| 273 DISALLOW_COPY_AND_ASSIGN(TabContentsWrapper); | 272 DISALLOW_COPY_AND_ASSIGN(TabContentsWrapper); |
| 274 }; | 273 }; |
| 275 | 274 |
| 276 #endif // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ | 275 #endif // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ |
| OLD | NEW |