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

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

Issue 10977048: Fix bug in disabling sync for default apps (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fix browser and integration tests, which got broken Created 8 years, 2 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/unpacked_installer.h" 5 #include "chrome/browser/extensions/unpacked_installer.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 void SimpleExtensionLoadPrompt::ShowPrompt() { 63 void SimpleExtensionLoadPrompt::ShowPrompt() {
64 install_ui_->ConfirmInstall(this, extension_); 64 install_ui_->ConfirmInstall(this, extension_);
65 } 65 }
66 66
67 void SimpleExtensionLoadPrompt::InstallUIProceed() { 67 void SimpleExtensionLoadPrompt::InstallUIProceed() {
68 if (service_weak_.get()) { 68 if (service_weak_.get()) {
69 extensions::PermissionsUpdater perms_updater(service_weak_->profile()); 69 extensions::PermissionsUpdater perms_updater(service_weak_->profile());
70 perms_updater.GrantActivePermissions(extension_, false); 70 perms_updater.GrantActivePermissions(extension_, false);
71 service_weak_->OnExtensionInstalled( 71 service_weak_->OnExtensionInstalled(
72 extension_, 72 extension_,
73 false, // Not from web store.
74 syncer::StringOrdinal(), 73 syncer::StringOrdinal(),
75 false /* no requirement errors */); 74 false /* no requirement errors */);
76 } 75 }
77 delete this; 76 delete this;
78 } 77 }
79 78
80 void SimpleExtensionLoadPrompt::InstallUIAbort(bool user_initiated) { 79 void SimpleExtensionLoadPrompt::InstallUIAbort(bool user_initiated) {
81 delete this; 80 delete this;
82 } 81 }
83 82
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 service_weak_->profile(), 254 service_weak_->profile(),
256 service_weak_, 255 service_weak_,
257 extension_); 256 extension_);
258 prompt->ShowPrompt(); 257 prompt->ShowPrompt();
259 return; // continues in SimpleExtensionLoadPrompt::InstallPrompt* 258 return; // continues in SimpleExtensionLoadPrompt::InstallPrompt*
260 } 259 }
261 260
262 PermissionsUpdater perms_updater(service_weak_->profile()); 261 PermissionsUpdater perms_updater(service_weak_->profile());
263 perms_updater.GrantActivePermissions(extension_, false); 262 perms_updater.GrantActivePermissions(extension_, false);
264 service_weak_->OnExtensionInstalled(extension_, 263 service_weak_->OnExtensionInstalled(extension_,
265 false, // Not from web store.
266 syncer::StringOrdinal(), 264 syncer::StringOrdinal(),
267 false /* no requirement errors */); 265 false /* no requirement errors */);
268 } 266 }
269 267
270 } // namespace extensions 268 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698