Chromium Code Reviews| Index: chrome/browser/automation/testing_automation_provider.cc |
| diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc |
| index 8480c30c75864fe258882f2e174fa49b1ebb86c0..e7c5661fdb6456f5bf1aa541c034d8c29bc44b0e 100644 |
| --- a/chrome/browser/automation/testing_automation_provider.cc |
| +++ b/chrome/browser/automation/testing_automation_provider.cc |
| @@ -3901,7 +3901,8 @@ void TestingAutomationProvider::GetThemeInfo( |
| DictionaryValue* args, |
| IPC::Message* reply_message) { |
| scoped_ptr<DictionaryValue> return_value(new DictionaryValue); |
| - const Extension* theme = ThemeServiceFactory::GetThemeForProfile(profile()); |
| + const Extension* theme = |
|
Yoyo Zhou
2012/05/23 23:17:49
nit: This change looks spurious.
Jay Civelli
2012/05/30 20:20:35
Done.
|
| + ThemeServiceFactory::GetThemeForProfile(profile()); |
| if (theme) { |
| return_value->SetString("name", theme->name()); |
| return_value->Set("images", theme->GetThemeImages()->DeepCopy()); |
| @@ -3946,8 +3947,8 @@ void TestingAutomationProvider::InstallExtension( |
| // If the given path has a 'crx' extension, assume it is a packed extension |
| // and install it. Otherwise load it as an unpacked extension. |
| if (extension_path.MatchesExtension(FILE_PATH_LITERAL(".crx"))) { |
| - ExtensionInstallUI* client = |
| - (with_ui ? new ExtensionInstallUI(browser->profile()) : NULL); |
| + ExtensionInstallPrompt* client = |
| + (with_ui ? new ExtensionInstallPrompt(browser->profile()) : NULL); |
| scoped_refptr<CrxInstaller> installer( |
| CrxInstaller::Create(service, client)); |
| if (!with_ui) |