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

Side by Side Diff: chrome/browser/extensions/navigation_observer.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_NAVIGATION_OBSERVER_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_NAVIGATION_OBSERVER_H_
6 #define CHROME_BROWSER_EXTENSIONS_NAVIGATION_OBSERVER_H_ 6 #define CHROME_BROWSER_EXTENSIONS_NAVIGATION_OBSERVER_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/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "chrome/browser/extensions/extension_install_prompt.h" 14 #include "chrome/browser/extensions/extension_install_prompt.h"
15 #include "content/public/browser/notification_observer.h" 15 #include "content/public/browser/notification_observer.h"
16 #include "content/public/browser/notification_registrar.h" 16 #include "content/public/browser/notification_registrar.h"
17 17
18 class Profile; 18 class Profile;
19 19
20 namespace content { 20 namespace content {
21 class NavigationController; 21 class NavigationController;
22 } 22 }
(...skipping 24 matching lines...) Expand all
47 void PromptToEnableExtensionIfNecessary( 47 void PromptToEnableExtensionIfNecessary(
48 content::NavigationController* nav_controller); 48 content::NavigationController* nav_controller);
49 49
50 void OnInstallPromptDone(ExtensionInstallPrompt::Result result); 50 void OnInstallPromptDone(ExtensionInstallPrompt::Result result);
51 51
52 content::NotificationRegistrar registrar_; 52 content::NotificationRegistrar registrar_;
53 53
54 Profile* profile_; 54 Profile* profile_;
55 55
56 // The UI used to confirm enabling extensions. 56 // The UI used to confirm enabling extensions.
57 scoped_ptr<ExtensionInstallPrompt> extension_install_prompt_; 57 std::unique_ptr<ExtensionInstallPrompt> extension_install_prompt_;
58 58
59 // The data we keep track of when prompting to enable extensions. 59 // The data we keep track of when prompting to enable extensions.
60 std::string in_progress_prompt_extension_id_; 60 std::string in_progress_prompt_extension_id_;
61 content::NavigationController* in_progress_prompt_navigation_controller_; 61 content::NavigationController* in_progress_prompt_navigation_controller_;
62 62
63 // The extension ids we've already prompted the user about. 63 // The extension ids we've already prompted the user about.
64 std::set<std::string> prompted_extensions_; 64 std::set<std::string> prompted_extensions_;
65 65
66 base::WeakPtrFactory<NavigationObserver> weak_factory_; 66 base::WeakPtrFactory<NavigationObserver> weak_factory_;
67 67
68 DISALLOW_COPY_AND_ASSIGN(NavigationObserver); 68 DISALLOW_COPY_AND_ASSIGN(NavigationObserver);
69 }; 69 };
70 70
71 } // namespace extensions 71 } // namespace extensions
72 72
73 #endif // CHROME_BROWSER_EXTENSIONS_NAVIGATION_OBSERVER_H_ 73 #endif // CHROME_BROWSER_EXTENSIONS_NAVIGATION_OBSERVER_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/menu_manager_unittest.cc ('k') | chrome/browser/extensions/navigation_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698