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

Side by Side Diff: chrome/browser/chromeos/app_mode/kiosk_app_manager.cc

Issue 2810973004: Revert of Fetch ARC Kiosk app name and icon from Android side. (Closed)
Patch Set: Created 3 years, 8 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
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 "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 5 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 base::CommandLine cmd_line(base::CommandLine::NO_PROGRAM); 156 base::CommandLine cmd_line(base::CommandLine::NO_PROGRAM);
157 cmd_line.AppendSwitch(flag_name); 157 cmd_line.AppendSwitch(flag_name);
158 DCHECK_EQ(2U, cmd_line.argv().size()); 158 DCHECK_EQ(2U, cmd_line.argv().size());
159 return cmd_line.argv()[1]; 159 return cmd_line.argv()[1];
160 } 160 }
161 161
162 } // namespace 162 } // namespace
163 163
164 // static 164 // static
165 const char KioskAppManager::kKioskDictionaryName[] = "kiosk"; 165 const char KioskAppManager::kKioskDictionaryName[] = "kiosk";
166 const char KioskAppManager::kKeyApps[] = "apps";
166 const char KioskAppManager::kKeyAutoLoginState[] = "auto_login_state"; 167 const char KioskAppManager::kKeyAutoLoginState[] = "auto_login_state";
167 const char KioskAppManager::kIconCacheDir[] = "kiosk/icon"; 168 const char KioskAppManager::kIconCacheDir[] = "kiosk/icon";
168 const char KioskAppManager::kCrxCacheDir[] = "kiosk/crx"; 169 const char KioskAppManager::kCrxCacheDir[] = "kiosk/crx";
169 const char KioskAppManager::kCrxUnpackDir[] = "kiosk_unpack"; 170 const char KioskAppManager::kCrxUnpackDir[] = "kiosk_unpack";
170 171
171 // static 172 // static
172 static base::LazyInstance<KioskAppManager>::DestructorAtExit instance = 173 static base::LazyInstance<KioskAppManager>::DestructorAtExit instance =
173 LAZY_INSTANCE_INITIALIZER; 174 LAZY_INSTANCE_INITIALIZER;
174 KioskAppManager* KioskAppManager::Get() { 175 KioskAppManager* KioskAppManager::Get() {
175 return instance.Pointer(); 176 return instance.Pointer();
(...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after
968 base::TimeDelta KioskAppManager::GetAutoLaunchDelay() const { 969 base::TimeDelta KioskAppManager::GetAutoLaunchDelay() const {
969 int delay; 970 int delay;
970 if (!CrosSettings::Get()->GetInteger( 971 if (!CrosSettings::Get()->GetInteger(
971 kAccountsPrefDeviceLocalAccountAutoLoginDelay, &delay)) { 972 kAccountsPrefDeviceLocalAccountAutoLoginDelay, &delay)) {
972 return base::TimeDelta(); // Default delay is 0ms. 973 return base::TimeDelta(); // Default delay is 0ms.
973 } 974 }
974 return base::TimeDelta::FromMilliseconds(delay); 975 return base::TimeDelta::FromMilliseconds(delay);
975 } 976 }
976 977
977 } // namespace chromeos 978 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698