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

Side by Side Diff: chrome/browser/chromeos/customization_document.cc

Issue 102973008: Removing GetDefaultProfile from CustomizationDocument (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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/chromeos/customization_document.h" 5 #include "chrome/browser/chromeos/customization_document.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/json/json_reader.h" 11 #include "base/json/json_reader.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/prefs/pref_registry_simple.h" 13 #include "base/prefs/pref_registry_simple.h"
14 #include "base/prefs/pref_service.h" 14 #include "base/prefs/pref_service.h"
15 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "base/time/time.h" 17 #include "base/time/time.h"
18 #include "chrome/browser/browser_process.h" 18 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/chromeos/login/wizard_controller.h" 19 #include "chrome/browser/chromeos/login/wizard_controller.h"
20 #include "chrome/browser/profiles/profile_manager.h" 20 #include "chrome/browser/profiles/profile_manager.h"
Dmitry Polukhin 2013/12/20 20:50:15 I think we don't need this include anymore.
Mr4D (OOO till 08-26) 2013/12/20 22:57:21 In deed! Done!
21 #include "chromeos/network/network_state.h" 21 #include "chromeos/network/network_state.h"
22 #include "chromeos/network/network_state_handler.h" 22 #include "chromeos/network/network_state_handler.h"
23 #include "chromeos/system/statistics_provider.h" 23 #include "chromeos/system/statistics_provider.h"
24 #include "content/public/browser/browser_thread.h" 24 #include "content/public/browser/browser_thread.h"
25 #include "net/url_request/url_fetcher.h" 25 #include "net/url_request/url_fetcher.h"
26 26
27 using content::BrowserThread; 27 using content::BrowserThread;
28 28
29 // Manifest attributes names. 29 // Manifest attributes names.
30 30
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 } else { 290 } else {
291 VLOG(1) << "Failed to load services customization manifest from: " 291 VLOG(1) << "Failed to load services customization manifest from: "
292 << file.value(); 292 << file.value();
293 } 293 }
294 } 294 }
295 295
296 void ServicesCustomizationDocument::StartFileFetch() { 296 void ServicesCustomizationDocument::StartFileFetch() {
297 DCHECK(url_.is_valid()); 297 DCHECK(url_.is_valid());
298 url_fetcher_.reset(net::URLFetcher::Create( 298 url_fetcher_.reset(net::URLFetcher::Create(
299 url_, net::URLFetcher::GET, this)); 299 url_, net::URLFetcher::GET, this));
300 url_fetcher_->SetRequestContext( 300 url_fetcher_->SetRequestContext(g_browser_process->system_request_context());
301 ProfileManager::GetDefaultProfile()->GetRequestContext());
302 url_fetcher_->Start(); 301 url_fetcher_->Start();
303 } 302 }
304 303
305 void ServicesCustomizationDocument::OnURLFetchComplete( 304 void ServicesCustomizationDocument::OnURLFetchComplete(
306 const net::URLFetcher* source) { 305 const net::URLFetcher* source) {
307 if (source->GetResponseCode() == 200) { 306 if (source->GetResponseCode() == 200) {
308 std::string data; 307 std::string data;
309 source->GetResponseAsString(&data); 308 source->GetResponseAsString(&data);
310 LoadManifestFromString(data); 309 LoadManifestFromString(data);
311 } else { 310 } else {
(...skipping 25 matching lines...) Expand all
337 locale, kAppContentAttr, kInitialStartPageAttr); 336 locale, kAppContentAttr, kInitialStartPageAttr);
338 } 337 }
339 338
340 std::string ServicesCustomizationDocument::GetSupportPage( 339 std::string ServicesCustomizationDocument::GetSupportPage(
341 const std::string& locale) const { 340 const std::string& locale) const {
342 return GetLocaleSpecificString( 341 return GetLocaleSpecificString(
343 locale, kAppContentAttr, kSupportPageAttr); 342 locale, kAppContentAttr, kSupportPageAttr);
344 } 343 }
345 344
346 } // namespace chromeos 345 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698