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

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

Issue 9456019: Add GTK interface for installing bundles of extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix compile Created 8 years, 10 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_dialog.h" 5 #include "chrome/browser/extensions/extension_install_dialog.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/common/chrome_switches.h" 13 #include "chrome/common/chrome_switches.h"
14 #include "chrome/common/extensions/extension.h" 14 #include "chrome/common/extensions/extension.h"
15 #include "third_party/skia/include/core/SkBitmap.h"
16 #include "ui/gfx/image/image.h"
15 17
16 namespace { 18 namespace {
17 19
18 // A flag used for SetExtensionInstallDialogAutoConfirmForTests 20 // A flag used for SetExtensionInstallDialogAutoConfirmForTests
19 enum AutoConfirmForTest { 21 enum AutoConfirmForTest {
20 DO_NOT_SKIP = 0, 22 DO_NOT_SKIP = 0,
21 PROCEED, 23 PROCEED,
22 ABORT 24 ABORT
23 }; 25 };
24 26
(...skipping 27 matching lines...) Expand all
52 return ABORT; 54 return ABORT;
53 else 55 else
54 NOTREACHED(); 56 NOTREACHED();
55 return DO_NOT_SKIP; 57 return DO_NOT_SKIP;
56 } 58 }
57 59
58 } // namespace 60 } // namespace
59 61
60 void ShowExtensionInstallDialog(Profile* profile, 62 void ShowExtensionInstallDialog(Profile* profile,
61 ExtensionInstallUI::Delegate* delegate, 63 ExtensionInstallUI::Delegate* delegate,
62 const Extension* extension,
63 SkBitmap* icon,
64 const ExtensionInstallUI::Prompt& prompt) { 64 const ExtensionInstallUI::Prompt& prompt) {
65 AutoConfirmForTest auto_confirm = CheckAutoConfirmCommandLineSwitch(); 65 AutoConfirmForTest auto_confirm = CheckAutoConfirmCommandLineSwitch();
66 if (auto_confirm != DO_NOT_SKIP) { 66 if (auto_confirm != DO_NOT_SKIP) {
67 DoAutoConfirm(auto_confirm, delegate); 67 DoAutoConfirm(auto_confirm, delegate);
68 return; 68 return;
69 } 69 }
70 ShowExtensionInstallDialogImpl(profile, delegate, extension, icon, prompt); 70 ShowExtensionInstallDialogImpl(profile, delegate, prompt);
71 } 71 }
72 72
73 bool ShowExtensionInstallDialogForManifest( 73 bool ShowExtensionInstallDialogForManifest(
74 Profile *profile, 74 Profile* profile,
75 ExtensionInstallUI::Delegate* delegate, 75 ExtensionInstallUI::Delegate* delegate,
76 const DictionaryValue* manifest, 76 const DictionaryValue* manifest,
77 const std::string& id, 77 const std::string& id,
78 const std::string& localized_name, 78 const std::string& localized_name,
79 const std::string& localized_description, 79 const std::string& localized_description,
80 SkBitmap* icon, 80 SkBitmap* icon,
81 const ExtensionInstallUI::Prompt& prompt, 81 const ExtensionInstallUI::Prompt& prompt,
82 scoped_refptr<Extension>* dummy_extension) { 82 scoped_refptr<Extension>* dummy_extension) {
83 scoped_ptr<DictionaryValue> localized_manifest; 83 scoped_ptr<DictionaryValue> localized_manifest;
84 if (!localized_name.empty() || !localized_description.empty()) { 84 if (!localized_name.empty() || !localized_description.empty()) {
(...skipping 28 matching lines...) Expand all
113 // confirmation dialog. 113 // confirmation dialog.
114 AutoConfirmForTest auto_confirm = CheckAutoConfirmCommandLineSwitch(); 114 AutoConfirmForTest auto_confirm = CheckAutoConfirmCommandLineSwitch();
115 if (auto_confirm != DO_NOT_SKIP) { 115 if (auto_confirm != DO_NOT_SKIP) {
116 DoAutoConfirm(auto_confirm, delegate); 116 DoAutoConfirm(auto_confirm, delegate);
117 return true; 117 return true;
118 } 118 }
119 119
120 ExtensionInstallUI::Prompt filled_out_prompt = prompt; 120 ExtensionInstallUI::Prompt filled_out_prompt = prompt;
121 filled_out_prompt.SetPermissions( 121 filled_out_prompt.SetPermissions(
122 (*dummy_extension)->GetPermissionMessageStrings()); 122 (*dummy_extension)->GetPermissionMessageStrings());
123 filled_out_prompt.set_extension(*dummy_extension);
124 filled_out_prompt.set_icon(gfx::Image(new SkBitmap(*icon)));
123 125
124 ShowExtensionInstallDialog(profile, 126 ShowExtensionInstallDialog(profile, delegate, filled_out_prompt);
125 delegate,
126 dummy_extension->get(),
127 icon,
128 filled_out_prompt);
129 return true; 127 return true;
130 } 128 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_install_dialog.h ('k') | chrome/browser/extensions/extension_install_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698