| OLD | NEW |
| 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/chromeos/ui/screensaver_extension_dialog.h" | 5 #include "chrome/browser/chromeos/ui/screensaver_extension_dialog.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_helper.h" |
| 10 #include "chrome/browser/extensions/extension_service.h" | 11 #include "chrome/browser/extensions/extension_service.h" |
| 11 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/browser/profiles/profile_manager.h" | 13 #include "chrome/browser/profiles/profile_manager.h" |
| 13 #include "chrome/browser/sessions/restore_tab_helper.h" | 14 #include "chrome/browser/sessions/restore_tab_helper.h" |
| 14 #include "chrome/browser/ui/views/extensions/extension_dialog.h" | 15 #include "chrome/browser/ui/views/extensions/extension_dialog.h" |
| 15 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
| 16 #include "chrome/common/extensions/extension.h" | 17 #include "chrome/common/extensions/extension.h" |
| 17 #include "chrome/common/extensions/extension_file_util.h" | 18 #include "chrome/common/extensions/extension_file_util.h" |
| 18 | 19 |
| 19 using content::BrowserThread; | 20 using content::BrowserThread; |
| (...skipping 28 matching lines...) Expand all Loading... |
| 48 if (g_instance) | 49 if (g_instance) |
| 49 g_instance->Close(); | 50 g_instance->Close(); |
| 50 } | 51 } |
| 51 | 52 |
| 52 ScreensaverExtensionDialog::ScreensaverExtensionDialog() | 53 ScreensaverExtensionDialog::ScreensaverExtensionDialog() |
| 53 : screensaver_extension_(NULL), | 54 : screensaver_extension_(NULL), |
| 54 loading_extension_(false) { | 55 loading_extension_(false) { |
| 55 } | 56 } |
| 56 | 57 |
| 57 void ScreensaverExtensionDialog::LoadExtension() { | 58 void ScreensaverExtensionDialog::LoadExtension() { |
| 59 // If the helper is not initialized, call us again when it is. |
| 60 // We can't get the screensaver path till the helper is ready. |
| 61 if (!chromeos::KioskModeHelper::Get()->is_initialized()) { |
| 62 chromeos::KioskModeHelper::Get()->Initialize( |
| 63 base::Bind(&ScreensaverExtensionDialog::LoadExtension, |
| 64 base::Unretained(this))); |
| 65 return; |
| 66 } |
| 67 |
| 58 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); | 68 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
| 59 std::string error; | 69 std::string error; |
| 60 std::string extension_path = CommandLine::ForCurrentProcess()-> | |
| 61 GetSwitchValueASCII(switches::kKioskModeScreensaverPath); | |
| 62 | 70 |
| 63 scoped_refptr<Extension> screensaver_extension = | 71 scoped_refptr<Extension> screensaver_extension = |
| 64 extension_file_util::LoadExtension( | 72 extension_file_util::LoadExtension( |
| 65 FilePath(extension_path), | 73 FilePath(chromeos::KioskModeHelper::Get()->GetScreensaverPath()), |
| 66 Extension::COMPONENT, | 74 Extension::COMPONENT, |
| 67 Extension::NO_FLAGS, | 75 Extension::NO_FLAGS, |
| 68 &error); | 76 &error); |
| 69 | 77 |
| 70 if (!screensaver_extension) { | 78 if (!screensaver_extension) { |
| 71 LOG(ERROR) << "Could not load screensaver extension from: " << | 79 LOG(ERROR) << "Could not load screensaver extension from: " << |
| 72 extension_path; | 80 chromeos::KioskModeHelper::Get()->GetScreensaverPath(); |
| 73 return; | 81 return; |
| 74 } | 82 } |
| 75 | 83 |
| 76 BrowserThread::PostTask(BrowserThread::UI, | 84 BrowserThread::PostTask(BrowserThread::UI, |
| 77 FROM_HERE, | 85 FROM_HERE, |
| 78 base::Bind( | 86 base::Bind( |
| 79 &ScreensaverExtensionDialog::SetExtensionAndShow, | 87 &ScreensaverExtensionDialog::SetExtensionAndShow, |
| 80 base::Unretained(this), | 88 base::Unretained(this), |
| 81 screensaver_extension)); | 89 screensaver_extension)); |
| 82 } | 90 } |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 base::Unretained(this))); | 157 base::Unretained(this))); |
| 150 dialog->Close(); | 158 dialog->Close(); |
| 151 } | 159 } |
| 152 | 160 |
| 153 void ScreensaverExtensionDialog::ReloadAndShow() { | 161 void ScreensaverExtensionDialog::ReloadAndShow() { |
| 154 ProfileManager::GetDefaultProfile()->GetExtensionService()->ReloadExtension( | 162 ProfileManager::GetDefaultProfile()->GetExtensionService()->ReloadExtension( |
| 155 screensaver_extension_->id()); | 163 screensaver_extension_->id()); |
| 156 | 164 |
| 157 Show(); | 165 Show(); |
| 158 } | 166 } |
| OLD | NEW |