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

Side by Side Diff: chrome/browser/extensions/tab_helper.h

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header Created 4 years, 8 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
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 #ifndef CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_
6 #define CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_ 6 #define CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_
7 7
8 #include <memory>
8 #include <set> 9 #include <set>
9 #include <string> 10 #include <string>
10 11
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/observer_list.h" 15 #include "base/observer_list.h"
16 #include "chrome/browser/extensions/active_tab_permission_granter.h" 16 #include "chrome/browser/extensions/active_tab_permission_granter.h"
17 #include "chrome/browser/extensions/extension_reenabler.h" 17 #include "chrome/browser/extensions/extension_reenabler.h"
18 #include "chrome/common/extensions/webstore_install_result.h" 18 #include "chrome/common/extensions/webstore_install_result.h"
19 #include "chrome/common/web_application_info.h" 19 #include "chrome/common/web_application_info.h"
20 #include "content/public/browser/notification_observer.h" 20 #include "content/public/browser/notification_observer.h"
21 #include "content/public/browser/notification_registrar.h" 21 #include "content/public/browser/notification_registrar.h"
22 #include "content/public/browser/web_contents_observer.h" 22 #include "content/public/browser/web_contents_observer.h"
23 #include "content/public/browser/web_contents_user_data.h" 23 #include "content/public/browser/web_contents_user_data.h"
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 235
236 // Which navigation entry was active when the GetApplicationInfo request was 236 // Which navigation entry was active when the GetApplicationInfo request was
237 // sent, for verification when the reply returns. 237 // sent, for verification when the reply returns.
238 int last_committed_nav_entry_unique_id_; 238 int last_committed_nav_entry_unique_id_;
239 239
240 // Whether to trigger an update when the page load completes. 240 // Whether to trigger an update when the page load completes.
241 bool update_shortcut_on_load_complete_; 241 bool update_shortcut_on_load_complete_;
242 242
243 content::NotificationRegistrar registrar_; 243 content::NotificationRegistrar registrar_;
244 244
245 scoped_ptr<ScriptExecutor> script_executor_; 245 std::unique_ptr<ScriptExecutor> script_executor_;
246 246
247 scoped_ptr<LocationBarController> location_bar_controller_; 247 std::unique_ptr<LocationBarController> location_bar_controller_;
248 248
249 scoped_ptr<ExtensionActionRunner> extension_action_runner_; 249 std::unique_ptr<ExtensionActionRunner> extension_action_runner_;
250 250
251 scoped_ptr<ActiveTabPermissionGranter> active_tab_permission_granter_; 251 std::unique_ptr<ActiveTabPermissionGranter> active_tab_permission_granter_;
252 252
253 scoped_ptr<BookmarkAppHelper> bookmark_app_helper_; 253 std::unique_ptr<BookmarkAppHelper> bookmark_app_helper_;
254 254
255 // Creates WebstoreInlineInstaller instances for inline install triggers. 255 // Creates WebstoreInlineInstaller instances for inline install triggers.
256 scoped_ptr<WebstoreInlineInstallerFactory> webstore_inline_installer_factory_; 256 std::unique_ptr<WebstoreInlineInstallerFactory>
257 webstore_inline_installer_factory_;
257 258
258 // The reenable prompt for disabled extensions, if any. 259 // The reenable prompt for disabled extensions, if any.
259 scoped_ptr<ExtensionReenabler> extension_reenabler_; 260 std::unique_ptr<ExtensionReenabler> extension_reenabler_;
260 261
261 // Vend weak pointers that can be invalidated to stop in-progress loads. 262 // Vend weak pointers that can be invalidated to stop in-progress loads.
262 base::WeakPtrFactory<TabHelper> image_loader_ptr_factory_; 263 base::WeakPtrFactory<TabHelper> image_loader_ptr_factory_;
263 264
264 // Generic weak ptr factory for posting callbacks. 265 // Generic weak ptr factory for posting callbacks.
265 base::WeakPtrFactory<TabHelper> weak_ptr_factory_; 266 base::WeakPtrFactory<TabHelper> weak_ptr_factory_;
266 267
267 DISALLOW_COPY_AND_ASSIGN(TabHelper); 268 DISALLOW_COPY_AND_ASSIGN(TabHelper);
268 }; 269 };
269 270
270 } // namespace extensions 271 } // namespace extensions
271 272
272 #endif // CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_ 273 #endif // CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/sync_bundle.cc ('k') | chrome/browser/extensions/test_extension_environment.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698