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

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

Issue 342003005: Show alert failure for reloading unpacked extensions with bad manifest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved path handling back to C++ Created 6 years, 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/chrome_extension_web_contents_observer.h" 5 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
6 6
7 #include "chrome/browser/extensions/api/messaging/message_service.h" 7 #include "chrome/browser/extensions/api/messaging/message_service.h"
8 #include "chrome/browser/extensions/error_console/error_console.h" 8 #include "chrome/browser/extensions/error_console/error_console.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/common/render_messages.h" 10 #include "chrome/common/render_messages.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 return; 106 return;
107 107
108 ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context()); 108 ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context());
109 109
110 // Reload the extension if it has crashed. 110 // Reload the extension if it has crashed.
111 // TODO(yoz): This reload doesn't happen synchronously for unpacked 111 // TODO(yoz): This reload doesn't happen synchronously for unpacked
112 // extensions. It seems to be fast enough, but there is a race. 112 // extensions. It seems to be fast enough, but there is a race.
113 // We should delay loading until the extension has reloaded. 113 // We should delay loading until the extension has reloaded.
114 if (registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED)) { 114 if (registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED)) {
115 ExtensionSystem::Get(browser_context())-> 115 ExtensionSystem::Get(browser_context())->
116 extension_service()->ReloadExtension(extension_id); 116 extension_service()->ReloadExtension(extension_id, true);
117 } 117 }
118 } 118 }
119 119
120 } // namespace extensions 120 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698