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

Side by Side Diff: chrome/browser/automation/automation_provider_observers.cc

Issue 7553001: Revert 95009. Causing pyauto NTP test failures on all platforms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/ui/webui/extension_icon_source.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/automation/automation_provider_observers.h" 5 #include "chrome/browser/automation/automation_provider_observers.h"
6 6
7 #include <deque> 7 #include <deque>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1963 matching lines...) Expand 10 before | Expand all | Expand 10 after
1974 // of the created vector. 1974 // of the created vector.
1975 std::vector<DictionaryValue*>* GetAppInfoFromExtensions( 1975 std::vector<DictionaryValue*>* GetAppInfoFromExtensions(
1976 const ExtensionList* extensions, 1976 const ExtensionList* extensions,
1977 ExtensionService* ext_service) { 1977 ExtensionService* ext_service) {
1978 std::vector<DictionaryValue*>* apps_list = 1978 std::vector<DictionaryValue*>* apps_list =
1979 new std::vector<DictionaryValue*>(); 1979 new std::vector<DictionaryValue*>();
1980 for (ExtensionList::const_iterator ext = extensions->begin(); 1980 for (ExtensionList::const_iterator ext = extensions->begin();
1981 ext != extensions->end(); ++ext) { 1981 ext != extensions->end(); ++ext) {
1982 // Only return information about extensions that are actually apps. 1982 // Only return information about extensions that are actually apps.
1983 if ((*ext)->is_app()) { 1983 if ((*ext)->is_app()) {
1984 DictionaryValue* app_info = 1984 DictionaryValue* app_info = new DictionaryValue();
1985 AppLauncherHandler::CreateAppInfo(*ext, NULL, ext_service); 1985 AppLauncherHandler::CreateAppInfo(*ext, NULL, ext_service, app_info);
1986 if (!app_info)
1987 continue;
1988 app_info->SetBoolean("is_component_extension", 1986 app_info->SetBoolean("is_component_extension",
1989 (*ext)->location() == Extension::COMPONENT); 1987 (*ext)->location() == Extension::COMPONENT);
1990 1988
1991 // Convert the launch_type integer into a more descriptive string. 1989 // Convert the launch_type integer into a more descriptive string.
1992 int launch_type; 1990 int launch_type;
1993 const char* kLaunchType = "launch_type"; 1991 const char* kLaunchType = "launch_type";
1994 if (!app_info->GetInteger(kLaunchType, &launch_type)) { 1992 if (!app_info->GetInteger(kLaunchType, &launch_type)) {
1995 NOTREACHED() << "Can't get integer from key " << kLaunchType; 1993 NOTREACHED() << "Can't get integer from key " << kLaunchType;
1996 continue; 1994 continue;
1997 } 1995 }
(...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after
2652 void DragTargetDropAckNotificationObserver::Observe( 2650 void DragTargetDropAckNotificationObserver::Observe(
2653 int type, 2651 int type,
2654 const NotificationSource& source, 2652 const NotificationSource& source,
2655 const NotificationDetails& details) { 2653 const NotificationDetails& details) {
2656 if (automation_) { 2654 if (automation_) {
2657 AutomationJSONReply(automation_, 2655 AutomationJSONReply(automation_,
2658 reply_message_.release()).SendSuccess(NULL); 2656 reply_message_.release()).SendSuccess(NULL);
2659 } 2657 }
2660 delete this; 2658 delete this;
2661 } 2659 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/extension_icon_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698