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

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

Issue 282103003: Moved IS_EPHEMERAL flag to extension prefs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix up file header Created 6 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
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"
11 #include "base/prefs/pref_service.h" 11 #include "base/prefs/pref_service.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/strings/stringprintf.h" 14 #include "base/strings/stringprintf.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "chrome/browser/extensions/bundle_installer.h" 16 #include "chrome/browser/extensions/bundle_installer.h"
17 #include "chrome/browser/extensions/extension_install_ui.h" 17 #include "chrome/browser/extensions/extension_install_ui.h"
18 #include "chrome/browser/extensions/extension_util.h" 18 #include "chrome/browser/extensions/extension_util.h"
19 #include "chrome/browser/extensions/image_loader.h" 19 #include "chrome/browser/extensions/image_loader.h"
20 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 21 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
22 #include "chrome/browser/ui/browser.h" 22 #include "chrome/browser/ui/browser.h"
23 #include "chrome/browser/ui/browser_window.h" 23 #include "chrome/browser/ui/browser_window.h"
24 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
25 #include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h" 25 #include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h"
26 #include "chrome/common/pref_names.h" 26 #include "chrome/common/pref_names.h"
27 #include "components/signin/core/browser/profile_oauth2_token_service.h" 27 #include "components/signin/core/browser/profile_oauth2_token_service.h"
28 #include "content/public/browser/web_contents.h" 28 #include "content/public/browser/web_contents.h"
29 #include "extensions/browser/extension_prefs.h" 29 #include "extensions/browser/extension_prefs.h"
30 #include "extensions/browser/extension_util.h"
30 #include "extensions/common/constants.h" 31 #include "extensions/common/constants.h"
31 #include "extensions/common/extension.h" 32 #include "extensions/common/extension.h"
32 #include "extensions/common/extension_icon_set.h" 33 #include "extensions/common/extension_icon_set.h"
33 #include "extensions/common/extension_resource.h" 34 #include "extensions/common/extension_resource.h"
34 #include "extensions/common/feature_switch.h" 35 #include "extensions/common/feature_switch.h"
35 #include "extensions/common/manifest.h" 36 #include "extensions/common/manifest.h"
36 #include "extensions/common/manifest_constants.h" 37 #include "extensions/common/manifest_constants.h"
37 #include "extensions/common/manifest_handlers/icons_handler.h" 38 #include "extensions/common/manifest_handlers/icons_handler.h"
38 #include "extensions/common/permissions/permission_message_provider.h" 39 #include "extensions/common/permissions/permission_message_provider.h"
39 #include "extensions/common/permissions/permission_set.h" 40 #include "extensions/common/permissions/permission_set.h"
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 void ExtensionInstallPrompt::ConfirmReEnable(Delegate* delegate, 652 void ExtensionInstallPrompt::ConfirmReEnable(Delegate* delegate,
652 const Extension* extension) { 653 const Extension* extension) {
653 DCHECK(ui_loop_ == base::MessageLoop::current()); 654 DCHECK(ui_loop_ == base::MessageLoop::current());
654 extension_ = extension; 655 extension_ = extension;
655 permissions_ = extension->GetActivePermissions(); 656 permissions_ = extension->GetActivePermissions();
656 delegate_ = delegate; 657 delegate_ = delegate;
657 bool is_remote_install = 658 bool is_remote_install =
658 install_ui_->profile() && 659 install_ui_->profile() &&
659 extensions::ExtensionPrefs::Get(install_ui_->profile())->HasDisableReason( 660 extensions::ExtensionPrefs::Get(install_ui_->profile())->HasDisableReason(
660 extension->id(), extensions::Extension::DISABLE_REMOTE_INSTALL); 661 extension->id(), extensions::Extension::DISABLE_REMOTE_INSTALL);
661 if (extension->is_ephemeral()) 662 bool is_ephemeral =
663 extensions::util::IsEphemeralApp(extension->id(), install_ui_->profile());
664 if (is_ephemeral)
662 prompt_.set_type(LAUNCH_PROMPT); 665 prompt_.set_type(LAUNCH_PROMPT);
663 else if (is_remote_install) 666 else if (is_remote_install)
664 prompt_.set_type(REMOTE_INSTALL_PROMPT); 667 prompt_.set_type(REMOTE_INSTALL_PROMPT);
665 else 668 else
666 prompt_.set_type(RE_ENABLE_PROMPT); 669 prompt_.set_type(RE_ENABLE_PROMPT);
667 LoadImageIfNeeded(); 670 LoadImageIfNeeded();
668 } 671 }
669 672
670 void ExtensionInstallPrompt::ConfirmExternalInstall( 673 void ExtensionInstallPrompt::ConfirmExternalInstall(
671 Delegate* delegate, 674 Delegate* delegate,
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
863 } 866 }
864 867
865 if (AutoConfirmPrompt(delegate_)) 868 if (AutoConfirmPrompt(delegate_))
866 return; 869 return;
867 870
868 if (show_dialog_callback_.is_null()) 871 if (show_dialog_callback_.is_null())
869 GetDefaultShowDialogCallback().Run(show_params_, delegate_, prompt_); 872 GetDefaultShowDialogCallback().Run(show_params_, delegate_, prompt_);
870 else 873 else
871 show_dialog_callback_.Run(show_params_, delegate_, prompt_); 874 show_dialog_callback_.Run(show_params_, delegate_, prompt_);
872 } 875 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_disabled_ui.cc ('k') | chrome/browser/extensions/extension_prefs_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698