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

Side by Side Diff: chrome/browser/ui/views/select_file_dialog.cc

Issue 4974001: base: Get rid of 'using' declaration of StringAppendF. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 10 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
« no previous file with comments | « chrome/browser/net/url_info.cc ('k') | chrome/common/sandbox_mac.mm » ('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/shell_dialogs.h" 5 #include "chrome/browser/shell_dialogs.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 394
395 std::string exts_list; 395 std::string exts_list;
396 std::string desc_list; 396 std::string desc_list;
397 for (size_t i = 0; i < file_types_.extensions.size(); ++i) { 397 for (size_t i = 0; i < file_types_.extensions.size(); ++i) {
398 DCHECK(!file_types_.extensions[i].empty()); 398 DCHECK(!file_types_.extensions[i].empty());
399 399
400 std::string exts; 400 std::string exts;
401 for (size_t j = 0; j < file_types_.extensions[i].size(); ++j) { 401 for (size_t j = 0; j < file_types_.extensions[i].size(); ++j) {
402 if (!exts.empty()) 402 if (!exts.empty())
403 exts.append(","); 403 exts.append(",");
404 StringAppendF(&exts, "\"%s\"", file_types_.extensions[i][j].c_str()); 404 base::StringAppendF(&exts, "\"%s\"",
405 file_types_.extensions[i][j].c_str());
405 } 406 }
406 407
407 if (!exts_list.empty()) 408 if (!exts_list.empty())
408 exts_list.append(","); 409 exts_list.append(",");
409 StringAppendF(&exts_list, "[%s]", exts.c_str()); 410 base::StringAppendF(&exts_list, "[%s]", exts.c_str());
410 411
411 std::string desc; 412 std::string desc;
412 if (i < file_types_.extension_description_overrides.size()) { 413 if (i < file_types_.extension_description_overrides.size()) {
413 desc = UTF16ToUTF8(file_types_.extension_description_overrides[i]); 414 desc = UTF16ToUTF8(file_types_.extension_description_overrides[i]);
414 } else { 415 } else {
415 #if defined(OS_WIN) 416 #if defined(OS_WIN)
416 desc = WideToUTF8(file_types_.extensions[i][0]); 417 desc = WideToUTF8(file_types_.extensions[i][0]);
417 #elif defined(OS_POSIX) 418 #elif defined(OS_POSIX)
418 desc = file_types_.extensions[i][0]; 419 desc = file_types_.extensions[i][0];
419 #else 420 #else
420 NOTIMPLEMENTED(); 421 NOTIMPLEMENTED();
421 #endif 422 #endif
422 } 423 }
423 424
424 if (!desc_list.empty()) 425 if (!desc_list.empty())
425 desc_list.append(","); 426 desc_list.append(",");
426 StringAppendF(&desc_list, "\"%s\"", desc.c_str()); 427 base::StringAppendF(&desc_list, "\"%s\"", desc.c_str());
427 } 428 }
428 429
429 std::string filename = default_path_.BaseName().value(); 430 std::string filename = default_path_.BaseName().value();
430 431
431 return StringPrintf("{" 432 return StringPrintf("{"
432 "\"type\":\"%s\"," 433 "\"type\":\"%s\","
433 "\"all_files\":%s," 434 "\"all_files\":%s,"
434 "\"current_file\":\"%s\"," 435 "\"current_file\":\"%s\","
435 "\"file_types\":{\"exts\":[%s],\"desc\":[%s]}," 436 "\"file_types\":{\"exts\":[%s],\"desc\":[%s]},"
436 "\"file_type_index\":%d" 437 "\"file_type_index\":%d"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 // TODO(xiyuan): Change this when the infrastructure is improved. 475 // TODO(xiyuan): Change this when the infrastructure is improved.
475 HtmlDialogUIDelegate** delegate = HtmlDialogUI::GetPropertyAccessor(). 476 HtmlDialogUIDelegate** delegate = HtmlDialogUI::GetPropertyAccessor().
476 GetProperty(dom_ui_->tab_contents()->property_bag()); 477 GetProperty(dom_ui_->tab_contents()->property_bag());
477 HtmlDialogView* containing_view = static_cast<HtmlDialogView*>(*delegate); 478 HtmlDialogView* containing_view = static_cast<HtmlDialogView*>(*delegate);
478 DCHECK(containing_view); 479 DCHECK(containing_view);
479 480
480 containing_view->GetWindow()->UpdateWindowTitle(); 481 containing_view->GetWindow()->UpdateWindowTitle();
481 containing_view->GetWindow()->GetNonClientView()->SchedulePaint(); 482 containing_view->GetWindow()->GetNonClientView()->SchedulePaint();
482 } 483 }
483 } 484 }
OLDNEW
« no previous file with comments | « chrome/browser/net/url_info.cc ('k') | chrome/common/sandbox_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698