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

Side by Side Diff: chrome/browser/webdata/web_database.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
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 | « chrome/browser/web_applications/web_app.cc ('k') | chrome/common/automation_messages.h » ('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/webdata/web_database.h" 5 #include "chrome/browser/webdata/web_database.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 11
12 #include "app/sql/statement.h" 12 #include "app/sql/statement.h"
13 #include "app/sql/transaction.h" 13 #include "app/sql/transaction.h"
14 #include "base/string_number_conversions.h" 14 #include "base/string_number_conversions.h"
15 #include "base/string_split.h" 15 #include "base/string_split.h"
16 #include "base/string_util.h" 16 #include "base/string_util.h"
17 #include "base/tuple.h" 17 #include "base/tuple.h"
18 #include "base/utf_string_conversions.h" 18 #include "base/utf_string_conversions.h"
19 #include "chrome/browser/autofill/autofill_profile.h" 19 #include "chrome/browser/autofill/autofill_profile.h"
20 #include "chrome/browser/autofill/autofill_type.h" 20 #include "chrome/browser/autofill/autofill_type.h"
21 #include "chrome/browser/autofill/credit_card.h" 21 #include "chrome/browser/autofill/credit_card.h"
22 #include "chrome/browser/diagnostics/sqlite_diagnostics.h" 22 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
23 #include "chrome/browser/history/history_database.h" 23 #include "chrome/browser/history/history_database.h"
24 #include "chrome/browser/password_manager/encryptor.h" 24 #include "chrome/browser/password_manager/encryptor.h"
25 #include "chrome/browser/search_engines/template_url.h" 25 #include "chrome/browser/search_engines/template_url.h"
26 #include "chrome/browser/webdata/autofill_change.h" 26 #include "chrome/browser/webdata/autofill_change.h"
27 #include "chrome/common/guid.h" 27 #include "chrome/common/guid.h"
28 #include "chrome/common/notification_service.h" 28 #include "chrome/common/notification_service.h"
29 #include "gfx/codec/png_codec.h"
30 #include "third_party/skia/include/core/SkBitmap.h" 29 #include "third_party/skia/include/core/SkBitmap.h"
31 #include "ui/base/l10n/l10n_util.h" 30 #include "ui/base/l10n/l10n_util.h"
31 #include "ui/gfx/codec/png_codec.h"
32 #include "webkit/glue/form_field.h" 32 #include "webkit/glue/form_field.h"
33 #include "webkit/glue/password_form.h" 33 #include "webkit/glue/password_form.h"
34 34
35 // Encryptor is now in place for Windows and Mac. The Linux implementation 35 // Encryptor is now in place for Windows and Mac. The Linux implementation
36 // currently obfuscates only. Mac Encryptor implementation can block the 36 // currently obfuscates only. Mac Encryptor implementation can block the
37 // active thread while presenting UI to the user. See |encryptor_mac.mm| for 37 // active thread while presenting UI to the user. See |encryptor_mac.mm| for
38 // details. 38 // details.
39 // For details on the Linux work see: 39 // For details on the Linux work see:
40 // http://crbug.com/25404 40 // http://crbug.com/25404
41 41
(...skipping 2536 matching lines...) Expand 10 before | Expand all | Expand 10 after
2578 2578
2579 // Add successive versions here. Each should set the version number and 2579 // Add successive versions here. Each should set the version number and
2580 // compatible version number as appropriate, then fall through to the next 2580 // compatible version number as appropriate, then fall through to the next
2581 // case. 2581 // case.
2582 2582
2583 case kCurrentVersionNumber: 2583 case kCurrentVersionNumber:
2584 // No migration needed. 2584 // No migration needed.
2585 return sql::INIT_OK; 2585 return sql::INIT_OK;
2586 } 2586 }
2587 } 2587 }
OLDNEW
« no previous file with comments | « chrome/browser/web_applications/web_app.cc ('k') | chrome/common/automation_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698