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

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

Issue 8827013: Move/replace/rename URL-based extension getters from ExtensionService to/in ExtensionSet. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: origins Created 9 years 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 | Annotate | Revision Log
OLDNEW
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 #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/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "content/browser/tab_contents/navigation_controller.h" 9 #include "content/browser/tab_contents/navigation_controller.h"
10 #include "content/browser/tab_contents/navigation_entry.h" 10 #include "content/browser/tab_contents/navigation_entry.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 NavigationController* nav_controller) { 44 NavigationController* nav_controller) {
45 // Bail out if we're already running a prompt. 45 // Bail out if we're already running a prompt.
46 if (!in_progress_prompt_extension_id_.empty()) 46 if (!in_progress_prompt_extension_id_.empty())
47 return; 47 return;
48 48
49 NavigationEntry* nav_entry = nav_controller->GetActiveEntry(); 49 NavigationEntry* nav_entry = nav_controller->GetActiveEntry();
50 if (!nav_entry) 50 if (!nav_entry)
51 return; 51 return;
52 52
53 ExtensionService* extension_service = profile_->GetExtensionService(); 53 ExtensionService* extension_service = profile_->GetExtensionService();
54 const Extension* extension = 54 const Extension* extension = extension_service->disabled_extensions()->
55 extension_service->GetDisabledExtensionByWebExtent(nav_entry->url()); 55 GetByWebExtent(ExtensionURLInfo(nav_entry->url()));
56 if (!extension) 56 if (!extension)
57 return; 57 return;
58 58
59 // Try not to repeatedly prompt the user about the same extension. 59 // Try not to repeatedly prompt the user about the same extension.
60 if (prompted_extensions_.find(extension->id()) != prompted_extensions_.end()) 60 if (prompted_extensions_.find(extension->id()) != prompted_extensions_.end())
61 return; 61 return;
62 prompted_extensions_.insert(extension->id()); 62 prompted_extensions_.insert(extension->id());
63 63
64 ExtensionPrefs* extension_prefs = extension_service->extension_prefs(); 64 ExtensionPrefs* extension_prefs = extension_service->extension_prefs();
65 if (extension_prefs->DidExtensionEscalatePermissions(extension->id())) { 65 if (extension_prefs->DidExtensionEscalatePermissions(extension->id())) {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 in_progress_prompt_extension_id_ = ""; 99 in_progress_prompt_extension_id_ = "";
100 in_progress_prompt_navigation_controller_ = NULL; 100 in_progress_prompt_navigation_controller_ = NULL;
101 extension_install_ui_.reset(); 101 extension_install_ui_.reset();
102 102
103 std::string histogram_name = user_initiated ? 103 std::string histogram_name = user_initiated ?
104 "Extensions.Permissions_ReEnableCancel" : 104 "Extensions.Permissions_ReEnableCancel" :
105 "Extensions.Permissions_ReEnableAbort"; 105 "Extensions.Permissions_ReEnableAbort";
106 ExtensionService::RecordPermissionMessagesHistogram( 106 ExtensionService::RecordPermissionMessagesHistogram(
107 extension, histogram_name.c_str()); 107 extension, histogram_name.c_str());
108 } 108 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698