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

Side by Side Diff: chrome/browser/chromeos/system/timezone_util.cc

Issue 448423002: Use a qualified path for grit includes in chrome/browser/chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix build Created 6 years, 4 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
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/system/timezone_util.h" 5 #include "chrome/browser/chromeos/system/timezone_util.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
12 #include "base/strings/stringprintf.h" 12 #include "base/strings/stringprintf.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "base/synchronization/lock.h" 14 #include "base/synchronization/lock.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "chrome/grit/generated_resources.h"
16 #include "chromeos/settings/timezone_settings.h" 17 #include "chromeos/settings/timezone_settings.h"
17 #include "grit/generated_resources.h"
18 #include "third_party/icu/source/common/unicode/ures.h" 18 #include "third_party/icu/source/common/unicode/ures.h"
19 #include "third_party/icu/source/common/unicode/utypes.h" 19 #include "third_party/icu/source/common/unicode/utypes.h"
20 #include "third_party/icu/source/i18n/unicode/calendar.h" 20 #include "third_party/icu/source/i18n/unicode/calendar.h"
21 #include "third_party/icu/source/i18n/unicode/timezone.h" 21 #include "third_party/icu/source/i18n/unicode/timezone.h"
22 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
23 23
24 namespace { 24 namespace {
25 25
26 struct UResClose { 26 struct UResClose {
27 inline void operator() (UResourceBundle* b) const { 27 inline void operator() (UResourceBundle* b) const {
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 option->Append(new base::StringValue( 138 option->Append(new base::StringValue(
139 chromeos::system::TimezoneSettings::GetTimezoneID(*timezone))); 139 chromeos::system::TimezoneSettings::GetTimezoneID(*timezone)));
140 option->Append(new base::StringValue(GetTimezoneName(*timezone))); 140 option->Append(new base::StringValue(GetTimezoneName(*timezone)));
141 timezoneList->Append(option); 141 timezoneList->Append(option);
142 } 142 }
143 return timezoneList.Pass(); 143 return timezoneList.Pass();
144 } 144 }
145 145
146 } // namespace system 146 } // namespace system
147 } // namespace chromeos 147 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/network_menu.cc ('k') | chrome/browser/chromeos/ui/echo_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698