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

Side by Side Diff: apps/app_load_service.cc

Issue 2523053004: Enhance chrome.app.window API for shelf integration with restore support (Closed)
Patch Set: Review v2 Created 4 years 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
« no previous file with comments | « no previous file | apps/launcher.h » ('j') | apps/launcher.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "apps/app_load_service.h" 5 #include "apps/app_load_service.h"
6 6
7 #include "apps/app_load_service_factory.h" 7 #include "apps/app_load_service_factory.h"
8 #include "apps/app_restore_service.h" 8 #include "apps/app_restore_service.h"
9 #include "apps/launcher.h" 9 #include "apps/launcher.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 return; 108 return;
109 109
110 switch (it->second.action_type) { 110 switch (it->second.action_type) {
111 case LAUNCH_FOR_RELOAD: 111 case LAUNCH_FOR_RELOAD:
112 LaunchPlatformApp(profile_, extension, extensions::SOURCE_RELOAD); 112 LaunchPlatformApp(profile_, extension, extensions::SOURCE_RELOAD);
113 break; 113 break;
114 case RESTART: 114 case RESTART:
115 RestartPlatformApp(profile_, extension); 115 RestartPlatformApp(profile_, extension);
116 break; 116 break;
117 case LAUNCH_FOR_LOAD_AND_LAUNCH: 117 case LAUNCH_FOR_LOAD_AND_LAUNCH:
118 LaunchPlatformAppWithCommandLine(profile_, 118 LaunchPlatformAppWithCommandLine(
119 extension, 119 profile_, extension, it->second.command_line, it->second.current_dir,
120 it->second.command_line, 120 extensions::SOURCE_LOAD_AND_LAUNCH);
stevenjb 2016/12/06 16:42:07 Please remove any formatting-only changes like thi
Andra Paraschiv 2016/12/07 08:33:21 Done.
121 it->second.current_dir,
122 extensions::SOURCE_LOAD_AND_LAUNCH);
123 break; 121 break;
124 default: 122 default:
125 NOTREACHED(); 123 NOTREACHED();
126 } 124 }
127 125
128 post_reload_actions_.erase(it); 126 post_reload_actions_.erase(it);
129 } 127 }
130 128
131 void AppLoadService::OnExtensionUnloaded( 129 void AppLoadService::OnExtensionUnloaded(
132 content::BrowserContext* browser_context, 130 content::BrowserContext* browser_context,
(...skipping 20 matching lines...) Expand all
153 Extension::DISABLE_RELOAD) != 0; 151 Extension::DISABLE_RELOAD) != 0;
154 } 152 }
155 return false; 153 return false;
156 } 154 }
157 155
158 bool AppLoadService::HasPostReloadAction(const std::string& extension_id) { 156 bool AppLoadService::HasPostReloadAction(const std::string& extension_id) {
159 return post_reload_actions_.find(extension_id) != post_reload_actions_.end(); 157 return post_reload_actions_.find(extension_id) != post_reload_actions_.end();
160 } 158 }
161 159
162 } // namespace apps 160 } // namespace apps
OLDNEW
« no previous file with comments | « no previous file | apps/launcher.h » ('j') | apps/launcher.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698