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

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

Issue 12680004: Remove chrome/ code to handle App Notifications (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflicts. Created 7 years, 9 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 | « chrome/browser/about_flags.cc ('k') | chrome/browser/extensions/api/app/app_api.h » ('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) 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/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 1863 matching lines...) Expand 10 before | Expand all | Expand 10 after
1874 std::vector<DictionaryValue*>* GetAppInfoFromExtensions( 1874 std::vector<DictionaryValue*>* GetAppInfoFromExtensions(
1875 const ExtensionSet* extensions, 1875 const ExtensionSet* extensions,
1876 ExtensionService* ext_service) { 1876 ExtensionService* ext_service) {
1877 std::vector<DictionaryValue*>* apps_list = 1877 std::vector<DictionaryValue*>* apps_list =
1878 new std::vector<DictionaryValue*>(); 1878 new std::vector<DictionaryValue*>();
1879 for (ExtensionSet::const_iterator ext = extensions->begin(); 1879 for (ExtensionSet::const_iterator ext = extensions->begin();
1880 ext != extensions->end(); ++ext) { 1880 ext != extensions->end(); ++ext) {
1881 // Only return information about extensions that are actually apps. 1881 // Only return information about extensions that are actually apps.
1882 if ((*ext)->is_app()) { 1882 if ((*ext)->is_app()) {
1883 DictionaryValue* app_info = new DictionaryValue(); 1883 DictionaryValue* app_info = new DictionaryValue();
1884 AppLauncherHandler::CreateAppInfo(*ext, NULL, ext_service, app_info); 1884 AppLauncherHandler::CreateAppInfo(*ext, ext_service, app_info);
1885 app_info->SetBoolean("is_component_extension", 1885 app_info->SetBoolean("is_component_extension",
1886 (*ext)->location() == extensions::Manifest::COMPONENT); 1886 (*ext)->location() == extensions::Manifest::COMPONENT);
1887 1887
1888 // Convert the launch_type integer into a more descriptive string. 1888 // Convert the launch_type integer into a more descriptive string.
1889 int launch_type; 1889 int launch_type;
1890 const char* kLaunchType = "launch_type"; 1890 const char* kLaunchType = "launch_type";
1891 if (!app_info->GetInteger(kLaunchType, &launch_type)) { 1891 if (!app_info->GetInteger(kLaunchType, &launch_type)) {
1892 NOTREACHED() << "Can't get integer from key " << kLaunchType; 1892 NOTREACHED() << "Can't get integer from key " << kLaunchType;
1893 continue; 1893 continue;
1894 } 1894 }
(...skipping 952 matching lines...) Expand 10 before | Expand all | Expand 10 after
2847 if (automation_) { 2847 if (automation_) {
2848 AutomationJSONReply(automation_, reply_message_.release()) 2848 AutomationJSONReply(automation_, reply_message_.release())
2849 .SendSuccess(NULL); 2849 .SendSuccess(NULL);
2850 } 2850 }
2851 delete this; 2851 delete this;
2852 } 2852 }
2853 } else { 2853 } else {
2854 NOTREACHED(); 2854 NOTREACHED();
2855 } 2855 }
2856 } 2856 }
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/extensions/api/app/app_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698