chrome/browser/extensions/navigation_observer.cc - Issue 1094873002: Extensions: Switch to new permission message system, part V

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1094873002: Extensions: Switch to new permission message system, part V (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 7 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

OLD	NEW
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/navigation_observer.h"	5 #include "chrome/browser/extensions/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/public/browser/navigation_controller.h"	9 #include "content/public/browser/navigation_controller.h"

10 #include "content/public/browser/navigation_entry.h"	10 #include "content/public/browser/navigation_entry.h"

(...skipping 93 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
104 void NavigationObserver::InstallUIAbort(bool user_initiated) {	104 void NavigationObserver::InstallUIAbort(bool user_initiated) {

105 ExtensionService* extension_service =	105 ExtensionService* extension_service =

106 extensions::ExtensionSystem::Get(profile_)->extension_service();	106 extensions::ExtensionSystem::Get(profile_)->extension_service();

107 const Extension* extension = extension_service->GetExtensionById(	107 const Extension* extension = extension_service->GetExtensionById(

108 in_progress_prompt_extension_id_, true);	108 in_progress_prompt_extension_id_, true);

109	109

110 in_progress_prompt_extension_id_ = "";	110 in_progress_prompt_extension_id_ = "";

111 in_progress_prompt_navigation_controller_ = NULL;	111 in_progress_prompt_navigation_controller_ = NULL;

112 extension_install_prompt_.reset();	112 extension_install_prompt_.reset();

113	113

114 std::string histogram_name = user_initiated	114 std::string histogram_name = user_initiated ? "ReEnableCancel"

115 ? "Extensions.Permissions_ReEnableCancel2"	115 : "ReEnableAbort";

116 : "Extensions.Permissions_ReEnableAbort2";

117 ExtensionService::RecordPermissionMessagesHistogram(	116 ExtensionService::RecordPermissionMessagesHistogram(

118 extension, histogram_name.c_str());	117 extension, histogram_name.c_str());

119 }	118 }

120	119

121 } // namespace extensions	120 } // namespace extensions

OLD	NEW