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

Side by Side Diff: chrome/browser/character_encoding.cc

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
« no previous file with comments | « chrome/browser/certificate_manager_model.cc ('k') | chrome/browser/chrome_browser_main.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) 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/character_encoding.h" 5 #include "chrome/browser/character_encoding.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/strings/string_tokenizer.h" 12 #include "base/strings/string_tokenizer.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "chrome/app/chrome_command_ids.h" 15 #include "chrome/app/chrome_command_ids.h"
16 #include "chrome/grit/generated_resources.h"
16 #include "content/public/browser/browser_thread.h" 17 #include "content/public/browser/browser_thread.h"
17 #include "grit/generated_resources.h"
18 #include "third_party/icu/source/common/unicode/ucnv.h" 18 #include "third_party/icu/source/common/unicode/ucnv.h"
19 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
20 #include "ui/base/l10n/l10n_util_collator.h" 20 #include "ui/base/l10n/l10n_util_collator.h"
21 21
22 using content::BrowserThread; 22 using content::BrowserThread;
23 23
24 namespace { 24 namespace {
25 25
26 // The maximum length of short list of recently user selected encodings is 3. 26 // The maximum length of short list of recently user selected encodings is 3.
27 const size_t kUserSelectedEncodingsMaxLength = 3; 27 const size_t kUserSelectedEncodingsMaxLength = 3;
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 // Insert new encoding to head of selected encoding list. 533 // Insert new encoding to head of selected encoding list.
534 *selected_encodings = encoding_name; 534 *selected_encodings = encoding_name;
535 // Generate the string for rest selected encoding list. 535 // Generate the string for rest selected encoding list.
536 for (std::vector<int>::const_iterator it = selected_encoding_list.begin(); 536 for (std::vector<int>::const_iterator it = selected_encoding_list.begin();
537 it != selected_encoding_list.end(); ++it) { 537 it != selected_encoding_list.end(); ++it) {
538 selected_encodings->append(1, L','); 538 selected_encodings->append(1, L',');
539 selected_encodings->append(GetCanonicalEncodingNameByCommandId(*it)); 539 selected_encodings->append(GetCanonicalEncodingNameByCommandId(*it));
540 } 540 }
541 return true; 541 return true;
542 } 542 }
OLDNEW
« no previous file with comments | « chrome/browser/certificate_manager_model.cc ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698