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

Side by Side Diff: chrome/browser/extensions/extension_navigation_observer.cc

Issue 10704023: Moved ExtensionPrefs and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest-er master merged in Created 8 years, 5 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 #include "chrome/browser/extensions/extension_navigation_observer.h" 5 #include "chrome/browser/extensions/extension_navigation_observer.h"
6 6
7 #include "chrome/browser/extensions/extension_service.h" 7 #include "chrome/browser/extensions/extension_service.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/browser_finder.h" 9 #include "chrome/browser/ui/browser_finder.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 extension_service->disabled_extensions()-> 61 extension_service->disabled_extensions()->
62 GetExtensionOrAppByURL(ExtensionURLInfo(nav_entry->GetURL())); 62 GetExtensionOrAppByURL(ExtensionURLInfo(nav_entry->GetURL()));
63 if (!extension) 63 if (!extension)
64 return; 64 return;
65 65
66 // Try not to repeatedly prompt the user about the same extension. 66 // Try not to repeatedly prompt the user about the same extension.
67 if (prompted_extensions_.find(extension->id()) != prompted_extensions_.end()) 67 if (prompted_extensions_.find(extension->id()) != prompted_extensions_.end())
68 return; 68 return;
69 prompted_extensions_.insert(extension->id()); 69 prompted_extensions_.insert(extension->id());
70 70
71 ExtensionPrefs* extension_prefs = extension_service->extension_prefs(); 71 extensions::ExtensionPrefs* extension_prefs =
72 extension_service->extension_prefs();
72 if (extension_prefs->DidExtensionEscalatePermissions(extension->id())) { 73 if (extension_prefs->DidExtensionEscalatePermissions(extension->id())) {
73 // Keep track of the extension id and nav controller we're prompting for. 74 // Keep track of the extension id and nav controller we're prompting for.
74 // These must be reset in InstallUIProceed and InstallUIAbort. 75 // These must be reset in InstallUIProceed and InstallUIAbort.
75 in_progress_prompt_extension_id_ = extension->id(); 76 in_progress_prompt_extension_id_ = extension->id();
76 in_progress_prompt_navigation_controller_ = nav_controller; 77 in_progress_prompt_navigation_controller_ = nav_controller;
77 78
78 Browser* browser = browser::FindBrowserWithWebContents( 79 Browser* browser = browser::FindBrowserWithWebContents(
79 nav_controller->GetWebContents()); 80 nav_controller->GetWebContents());
80 extension_install_prompt_.reset( 81 extension_install_prompt_.reset(
81 chrome::CreateExtensionInstallPromptWithBrowser(browser)); 82 chrome::CreateExtensionInstallPromptWithBrowser(browser));
(...skipping 28 matching lines...) Expand all
110 in_progress_prompt_extension_id_ = ""; 111 in_progress_prompt_extension_id_ = "";
111 in_progress_prompt_navigation_controller_ = NULL; 112 in_progress_prompt_navigation_controller_ = NULL;
112 extension_install_prompt_.reset(); 113 extension_install_prompt_.reset();
113 114
114 std::string histogram_name = user_initiated ? 115 std::string histogram_name = user_initiated ?
115 "Extensions.Permissions_ReEnableCancel" : 116 "Extensions.Permissions_ReEnableCancel" :
116 "Extensions.Permissions_ReEnableAbort"; 117 "Extensions.Permissions_ReEnableAbort";
117 ExtensionService::RecordPermissionMessagesHistogram( 118 ExtensionService::RecordPermissionMessagesHistogram(
118 extension, histogram_name.c_str()); 119 extension, histogram_name.c_str());
119 } 120 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_module.cc ('k') | chrome/browser/extensions/extension_pref_value_map.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698