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

Side by Side Diff: chrome/browser/webui/options/autofill_options_handler.cc

Issue 6516002: Move CC icons to chrome/common and implement loadPlatformResource in RendererWebKitClientImpl. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: '' Created 9 years, 10 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 | « no previous file | chrome/common/common_resources.grd » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/webui/options/autofill_options_handler.h" 5 #include "chrome/browser/webui/options/autofill_options_handler.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/string16.h" 10 #include "base/string16.h"
11 #include "base/string_number_conversions.h" 11 #include "base/string_number_conversions.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "chrome/browser/autofill/autofill_profile.h" 14 #include "chrome/browser/autofill/autofill_profile.h"
15 #include "chrome/browser/autofill/credit_card.h" 15 #include "chrome/browser/autofill/credit_card.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/webui/web_ui_util.h" 17 #include "chrome/browser/webui/web_ui_util.h"
18 #include "chrome/common/guid.h" 18 #include "chrome/common/guid.h"
19 #include "grit/common_resources.h"
19 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
20 #include "grit/webkit_resources.h" 21 #include "grit/webkit_resources.h"
21 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
22 23
23 namespace { 24 namespace {
24 25
25 // Converts a credit card type to the appropriate resource ID of the CC icon. 26 // Converts a credit card type to the appropriate resource ID of the CC icon.
26 int CreditCardTypeToResourceID(const string16& type16) { 27 int CreditCardTypeToResourceID(const string16& type16) {
27 std::string type = UTF16ToUTF8(type16); 28 std::string type = UTF16ToUTF8(type16);
28 if (type == kAmericanExpressCard) 29 if (type == kAmericanExpressCard)
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 if (args->GetString(4, &value)) 387 if (args->GetString(4, &value))
387 credit_card.SetInfo(AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR), value); 388 credit_card.SetInfo(AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR), value);
388 389
389 if (!guid::IsValidGUID(credit_card.guid())) { 390 if (!guid::IsValidGUID(credit_card.guid())) {
390 credit_card.set_guid(guid::GenerateGUID()); 391 credit_card.set_guid(guid::GenerateGUID());
391 personal_data_->AddCreditCard(credit_card); 392 personal_data_->AddCreditCard(credit_card);
392 } else { 393 } else {
393 personal_data_->UpdateCreditCard(credit_card); 394 personal_data_->UpdateCreditCard(credit_card);
394 } 395 }
395 } 396 }
OLDNEW
« no previous file with comments | « no previous file | chrome/common/common_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698