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

Side by Side Diff: chrome/browser/chromeos/login/apply_services_customization.cc

Issue 6272012: Temporary whitelist several cases of disk I/O on the UI threads in cros. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser/chromeos
Patch Set: remove UI thread restriction, nits Created 9 years, 11 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 | « base/nss_util.cc ('k') | chrome/browser/chromeos/login/help_app_launcher.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/chromeos/login/apply_services_customization.h" 5 #include "chrome/browser/chromeos/login/apply_services_customization.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/browser_thread.h" 13 #include "chrome/browser/browser_thread.h"
14 #include "chrome/browser/chromeos/cros/cros_library.h" 14 #include "chrome/browser/chromeos/cros/cros_library.h"
15 #include "chrome/browser/chromeos/cros/network_library.h" 15 #include "chrome/browser/chromeos/cros/network_library.h"
16 #include "chrome/browser/chromeos/customization_document.h" 16 #include "chrome/browser/chromeos/customization_document.h"
17 #include "chrome/browser/prefs/pref_service.h" 17 #include "chrome/browser/prefs/pref_service.h"
18 #include "chrome/browser/profiles/profile_manager.h" 18 #include "chrome/browser/profiles/profile_manager.h"
19 #include "googleurl/src/gurl.h" 19 #include "googleurl/src/gurl.h"
20 20
21 namespace { 21 namespace {
22 22
23 // URL where to fetch OEM services customization manifest from. 23 // URL where to fetch OEM services customization manifest from.
24 // TODO(denisromanov): Change this to real URL when it becomes available.
25 const char kServicesCustomizationManifestUrl[] = 24 const char kServicesCustomizationManifestUrl[] =
26 "file:///mnt/partner_partition/etc/chromeos/services_manifest.json"; 25 "file:///mnt/partner_partition/etc/chromeos/services_manifest.json";
27 26
28 // Name of local state option that tracks if services customization has been 27 // Name of local state option that tracks if services customization has been
29 // applied. 28 // applied.
30 const char kServicesCustomizationAppliedPref[] = "ServicesCustomizationApplied"; 29 const char kServicesCustomizationAppliedPref[] = "ServicesCustomizationApplied";
31 30
32 // Maximum number of retries to fetch file if network is not available. 31 // Maximum number of retries to fetch file if network is not available.
33 const int kMaxFetchRetries = 3; 32 const int kMaxFetchRetries = 3;
34 33
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 customization.initial_start_page_url()); 159 customization.initial_start_page_url());
161 VLOG(1) << "initial_start_page_url: " 160 VLOG(1) << "initial_start_page_url: "
162 << customization.initial_start_page_url(); 161 << customization.initial_start_page_url();
163 } 162 }
164 // TODO(dpolukhin): apply customized apps, exts and support page. 163 // TODO(dpolukhin): apply customized apps, exts and support page.
165 164
166 SetApplied(true); 165 SetApplied(true);
167 } 166 }
168 167
169 } // namespace chromeos 168 } // namespace chromeos
OLDNEW
« no previous file with comments | « base/nss_util.cc ('k') | chrome/browser/chromeos/login/help_app_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698