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

Side by Side Diff: chrome/browser/dom_ui/chrome_url_data_manager.cc

Issue 1073005: Move RTL related functions from app/l10n_util to base/i18n/rtl... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 9 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 | « chrome/browser/cookies_tree_model.cc ('k') | chrome/browser/dom_ui/dom_ui.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/dom_ui/chrome_url_data_manager.h" 5 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/i18n/rtl.h"
9 #include "base/message_loop.h" 10 #include "base/message_loop.h"
10 #include "base/path_service.h" 11 #include "base/path_service.h"
11 #include "base/singleton.h" 12 #include "base/singleton.h"
12 #include "base/string_util.h" 13 #include "base/string_util.h"
13 #include "base/thread.h" 14 #include "base/thread.h"
14 #include "base/values.h" 15 #include "base/values.h"
15 #if defined(OS_WIN) 16 #if defined(OS_WIN)
16 #include "base/win_util.h" 17 #include "base/win_util.h"
17 #endif 18 #endif
18 #include "chrome/browser/browser_process.h" 19 #include "chrome/browser/browser_process.h"
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 #if defined(OS_WIN) 293 #if defined(OS_WIN)
293 // Some fonts used for some languages changed a lot in terms of the font 294 // Some fonts used for some languages changed a lot in terms of the font
294 // metric in Vista. So, we need to use different size before Vista. 295 // metric in Vista. So, we need to use different size before Vista.
295 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) 296 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA)
296 web_font_size_id = IDS_WEB_FONT_SIZE_XP; 297 web_font_size_id = IDS_WEB_FONT_SIZE_XP;
297 #endif 298 #endif
298 localized_strings->SetString(L"fontsize", 299 localized_strings->SetString(L"fontsize",
299 l10n_util::GetString(web_font_size_id)); 300 l10n_util::GetString(web_font_size_id));
300 301
301 localized_strings->SetString(L"textdirection", 302 localized_strings->SetString(L"textdirection",
302 (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) ? 303 base::i18n::IsRTL() ? L"rtl" : L"ltr");
303 L"rtl" : L"ltr");
304 } 304 }
305 305
306 URLRequestJob* ChromeURLDataManager::Factory(URLRequest* request, 306 URLRequestJob* ChromeURLDataManager::Factory(URLRequest* request,
307 const std::string& scheme) { 307 const std::string& scheme) {
308 // Try first with a file handler 308 // Try first with a file handler
309 FilePath path; 309 FilePath path;
310 if (ChromeURLDataManager::URLToFilePath(request->url(), &path)) 310 if (ChromeURLDataManager::URLToFilePath(request->url(), &path))
311 return new URLRequestChromeFileJob(request, path); 311 return new URLRequestChromeFileJob(request, path);
312 312
313 // Next check for chrome://net-internals/, which uses its own job type. 313 // Next check for chrome://net-internals/, which uses its own job type.
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 net::ERR_INVALID_URL)); 403 net::ERR_INVALID_URL));
404 } 404 }
405 } 405 }
406 406
407 URLRequestChromeFileJob::URLRequestChromeFileJob(URLRequest* request, 407 URLRequestChromeFileJob::URLRequestChromeFileJob(URLRequest* request,
408 const FilePath& path) 408 const FilePath& path)
409 : URLRequestFileJob(request, path) { 409 : URLRequestFileJob(request, path) {
410 } 410 }
411 411
412 URLRequestChromeFileJob::~URLRequestChromeFileJob() { } 412 URLRequestChromeFileJob::~URLRequestChromeFileJob() { }
OLDNEW
« no previous file with comments | « chrome/browser/cookies_tree_model.cc ('k') | chrome/browser/dom_ui/dom_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698