| OLD | NEW |
| 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/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> |
| (...skipping 897 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 908 | 908 |
| 909 tmp = s.ColumnString(6); | 909 tmp = s.ColumnString(6); |
| 910 if (!tmp.empty()) | 910 if (!tmp.empty()) |
| 911 template_url->set_originating_url(GURL(tmp)); | 911 template_url->set_originating_url(GURL(tmp)); |
| 912 | 912 |
| 913 template_url->set_date_created(Time::FromTimeT(s.ColumnInt64(7))); | 913 template_url->set_date_created(Time::FromTimeT(s.ColumnInt64(7))); |
| 914 | 914 |
| 915 template_url->set_usage_count(s.ColumnInt(8)); | 915 template_url->set_usage_count(s.ColumnInt(8)); |
| 916 | 916 |
| 917 std::vector<std::string> encodings; | 917 std::vector<std::string> encodings; |
| 918 SplitString(s.ColumnString(9), ';', &encodings); | 918 base::SplitString(s.ColumnString(9), ';', &encodings); |
| 919 template_url->set_input_encodings(encodings); | 919 template_url->set_input_encodings(encodings); |
| 920 | 920 |
| 921 template_url->set_show_in_default_list(s.ColumnInt(10) == 1); | 921 template_url->set_show_in_default_list(s.ColumnInt(10) == 1); |
| 922 | 922 |
| 923 tmp = s.ColumnString(11); | 923 tmp = s.ColumnString(11); |
| 924 template_url->SetSuggestionsURL(tmp, 0, 0); | 924 template_url->SetSuggestionsURL(tmp, 0, 0); |
| 925 | 925 |
| 926 template_url->set_prepopulate_id(s.ColumnInt(12)); | 926 template_url->set_prepopulate_id(s.ColumnInt(12)); |
| 927 | 927 |
| 928 template_url->set_autogenerate_keyword(s.ColumnInt(13) == 1); | 928 template_url->set_autogenerate_keyword(s.ColumnInt(13) == 1); |
| (...skipping 1268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2197 | 2197 |
| 2198 // Add successive versions here. Each should set the version number and | 2198 // Add successive versions here. Each should set the version number and |
| 2199 // compatible version number as appropriate, then fall through to the next | 2199 // compatible version number as appropriate, then fall through to the next |
| 2200 // case. | 2200 // case. |
| 2201 | 2201 |
| 2202 case kCurrentVersionNumber: | 2202 case kCurrentVersionNumber: |
| 2203 // No migration needed. | 2203 // No migration needed. |
| 2204 return sql::INIT_OK; | 2204 return sql::INIT_OK; |
| 2205 } | 2205 } |
| 2206 } | 2206 } |
| OLD | NEW |