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

Unified Diff: chrome/browser/chromeos/accessibility/accessibility_extension_loader.h

Issue 2617633004: Fix AccessibilityExtensionLoader's handling of locked screen (Closed)
Patch Set: Test removals. Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/accessibility/accessibility_extension_loader.h
diff --git a/chrome/browser/chromeos/accessibility/accessibility_extension_loader.h b/chrome/browser/chromeos/accessibility/accessibility_extension_loader.h
index 34d30edbbf7331486cc4055b7ef1be32fedd0e7e..a8e983ad34f9c79617b9d2d9ca64c1041f1bce19 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_extension_loader.h
+++ b/chrome/browser/chromeos/accessibility/accessibility_extension_loader.h
@@ -9,11 +9,6 @@
#include "base/files/file_path.h"
#include "base/memory/weak_ptr.h"
-namespace content {
-class RenderViewHost;
-}
-
-class ExtensionService;
class Profile;
namespace chromeos {
@@ -26,35 +21,19 @@ class AccessibilityExtensionLoader {
~AccessibilityExtensionLoader();
void SetProfile(Profile* profile, const base::Closure& done_callback);
- void Load(Profile* profile,
- const std::string& init_script_str,
- const base::Closure& done_cb);
+ void Load(Profile* profile, const base::Closure& done_cb);
void Unload();
- void LoadToUserScreen(const base::Closure& done_cb);
- void LoadToLockScreen(const base::Closure& done_cb);
void LoadExtension(Profile* profile,
- content::RenderViewHost* render_view_host,
base::Closure done_cb);
- bool loaded_on_lock_screen() { return loaded_on_lock_screen_; }
-
private:
- void InjectContentScriptAndCallback(ExtensionService* extension_service,
- int render_process_id,
- int render_view_id,
- const base::Closure& done_cb);
- void UnloadFromLockScreen();
void UnloadExtensionFromProfile(Profile* profile);
Profile* profile_;
std::string extension_id_;
base::FilePath extension_path_;
- std::string init_script_str_;
- // Profile which the extension is currently loaded to.
- // If nullptr, it is not loaded to any profile.
- bool loaded_on_lock_screen_;
- bool loaded_on_user_screen_;
+ bool loaded_;
base::Closure unload_callback_;

Powered by Google App Engine
This is Rietveld 408576698