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

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

Issue 309533007: Refactor PermissionsData pt1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
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_install_prompt.h" 5 #include "chrome/browser/extensions/extension_install_prompt.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 extension_, image, gfx::Size(pixel_size, pixel_size), 704 extension_, image, gfx::Size(pixel_size, pixel_size),
705 base::Bind(&ExtensionInstallPrompt::OnImageLoaded, AsWeakPtr())); 705 base::Bind(&ExtensionInstallPrompt::OnImageLoaded, AsWeakPtr()));
706 } 706 }
707 707
708 void ExtensionInstallPrompt::ShowConfirmation() { 708 void ExtensionInstallPrompt::ShowConfirmation() {
709 if (prompt_.type() == INSTALL_PROMPT) 709 if (prompt_.type() == INSTALL_PROMPT)
710 prompt_.set_experiment(ExtensionInstallPromptExperiment::Find()); 710 prompt_.set_experiment(ExtensionInstallPromptExperiment::Find());
711 else 711 else
712 prompt_.set_experiment(ExtensionInstallPromptExperiment::ControlGroup()); 712 prompt_.set_experiment(ExtensionInstallPromptExperiment::ControlGroup());
713 713
714 if (permissions_.get() && 714 if (permissions_.get()) {
715 (!extension_ || 715 if (extension_) {
716 !extensions::PermissionsData::ShouldSkipPermissionWarnings( 716 const extensions::PermissionsData* permissions_data =
717 extension_))) { 717 extensions::PermissionsData::ForExtension(extension_);
718 Manifest::Type extension_type = extension_ ? 718 prompt_.SetPermissions(permissions_data->GetPermissionMessageStrings());
719 extension_->GetType() : Manifest::TYPE_UNKNOWN; 719 prompt_.SetPermissionsDetails(
720 prompt_.SetPermissions( 720 permissions_data->GetPermissionMessageDetailsStrings());
721 extensions::PermissionMessageProvider::Get()-> 721 } else {
722 GetWarningMessages(permissions_, extension_type)); 722 const extensions::PermissionMessageProvider* message_provider =
723 prompt_.SetPermissionsDetails( 723 extensions::PermissionMessageProvider::Get();
724 extensions::PermissionMessageProvider::Get()-> 724 prompt_.SetPermissions(message_provider->GetWarningMessages(
725 GetWarningMessagesDetails(permissions_, extension_type)); 725 permissions_, Manifest::TYPE_UNKNOWN));
726 prompt_.SetPermissionsDetails(message_provider->GetWarningMessagesDetails(
727 permissions_, Manifest::TYPE_UNKNOWN));
728 }
726 } 729 }
727 730
728 switch (prompt_.type()) { 731 switch (prompt_.type()) {
729 case PERMISSIONS_PROMPT: 732 case PERMISSIONS_PROMPT:
730 case RE_ENABLE_PROMPT: 733 case RE_ENABLE_PROMPT:
731 case INLINE_INSTALL_PROMPT: 734 case INLINE_INSTALL_PROMPT:
732 case EXTERNAL_INSTALL_PROMPT: 735 case EXTERNAL_INSTALL_PROMPT:
733 case INSTALL_PROMPT: 736 case INSTALL_PROMPT:
734 case LAUNCH_PROMPT: 737 case LAUNCH_PROMPT:
735 case POST_INSTALL_PERMISSIONS_PROMPT: 738 case POST_INSTALL_PERMISSIONS_PROMPT:
(...skipping 12 matching lines...) Expand all
748 } 751 }
749 752
750 if (AutoConfirmPrompt(delegate_)) 753 if (AutoConfirmPrompt(delegate_))
751 return; 754 return;
752 755
753 if (show_dialog_callback_.is_null()) 756 if (show_dialog_callback_.is_null())
754 GetDefaultShowDialogCallback().Run(show_params_, delegate_, prompt_); 757 GetDefaultShowDialogCallback().Run(show_params_, delegate_, prompt_);
755 else 758 else
756 show_dialog_callback_.Run(show_params_, delegate_, prompt_); 759 show_dialog_callback_.Run(show_params_, delegate_, prompt_);
757 } 760 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698