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

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

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. Created 9 years, 1 month 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
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/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_path.h" 9 #include "base/file_path.h"
10 #include "base/file_util.h" 10 #include "base/file_util.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/string_tokenizer.h" 13 #include "base/string_tokenizer.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/time.h" 15 #include "base/time.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
18 #include "chrome/browser/chromeos/cros/cros_library.h" 18 #include "chrome/browser/chromeos/cros/cros_library.h"
19 #include "chrome/browser/chromeos/cros/network_library.h" 19 #include "chrome/browser/chromeos/cros/network_library.h"
20 #include "chrome/browser/chromeos/login/wizard_controller.h" 20 #include "chrome/browser/chromeos/login/wizard_controller.h"
21 #include "chrome/browser/chromeos/system/statistics_provider.h" 21 #include "chrome/browser/chromeos/system/statistics_provider.h"
22 #include "chrome/browser/prefs/pref_service.h" 22 #include "chrome/browser/prefs/pref_service.h"
23 #include "chrome/browser/profiles/profile_manager.h" 23 #include "chrome/browser/profiles/profile_manager.h"
24 #include "content/public/browser/browser_thread.h" 24 #include "content/public/browser/browser_thread.h"
25 #include "content/public/common/url_fetcher.h" 25 #include "content/public/common/url_fetcher.h"
26 26
27 using content::BrowserThread;
28
27 // Manifest attributes names. 29 // Manifest attributes names.
28 30
29 namespace { 31 namespace {
30 32
31 const char kVersionAttr[] = "version"; 33 const char kVersionAttr[] = "version";
32 const char kDefaultAttr[] = "default"; 34 const char kDefaultAttr[] = "default";
33 const char kInitialLocaleAttr[] = "initial_locale"; 35 const char kInitialLocaleAttr[] = "initial_locale";
34 const char kInitialTimezoneAttr[] = "initial_timezone"; 36 const char kInitialTimezoneAttr[] = "initial_timezone";
35 const char kKeyboardLayoutAttr[] = "keyboard_layout"; 37 const char kKeyboardLayoutAttr[] = "keyboard_layout";
36 const char kRegistrationUrlAttr[] = "registration_url"; 38 const char kRegistrationUrlAttr[] = "registration_url";
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 locale, kAppContentAttr, kInitialStartPageAttr); 338 locale, kAppContentAttr, kInitialStartPageAttr);
337 } 339 }
338 340
339 std::string ServicesCustomizationDocument::GetSupportPage( 341 std::string ServicesCustomizationDocument::GetSupportPage(
340 const std::string& locale) const { 342 const std::string& locale) const {
341 return GetLocaleSpecificString( 343 return GetLocaleSpecificString(
342 locale, kAppContentAttr, kSupportPageAttr); 344 locale, kAppContentAttr, kSupportPageAttr);
343 } 345 }
344 346
345 } // namespace chromeos 347 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/update_library.cc ('k') | chrome/browser/chromeos/dbus/proxy_resolution_service_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698