app/l10n_util.cc - Issue 6263008: Move ResourceBundle, DataPack to ui/base

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: app/l10n_util.cc

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: 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:

Index: app/l10n_util.cc

===================================================================

--- app/l10n_util.cc (revision 72000)

+++ app/l10n_util.cc (working copy)

@@ -12,9 +12,7 @@

#include <cstdlib>

#include <iterator>

-#include "app/app_paths.h"

#include "app/l10n_util_collator.h"

-#include "app/resource_bundle.h"

#include "base/command_line.h"

#include "base/file_util.h"

#include "base/i18n/file_util_icu.h"

@@ -28,6 +26,8 @@

#include "base/utf_string_conversions.h"

#include "build/build_config.h"

#include "gfx/canvas.h"

+#include "ui/base/resource/resource_bundle.h"

+#include "ui/base/ui_base_paths.h"

#include "unicode/rbbi.h"

#include "unicode/uloc.h"

@@ -362,7 +362,7 @@

#else

FilePath locale_path;

- PathService::Get(app::DIR_LOCALES, &locale_path);

+ PathService::Get(ui::DIR_LOCALES, &locale_path);

std::string resolved_locale;

std::vector<std::string> candidates;

« no previous file with comments | « app/data_pack_unittest.cc ('k') | app/l10n_util_unittest.cc » ('j') | no next file with comments »