| OLD | NEW |
| 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/webdata/web_data_service.h" | 5 #include "chrome/browser/webdata/web_data_service.h" |
| 6 | 6 |
| 7 #include "base/stl_util.h" | 7 #include "base/stl_util.h" |
| 8 #include "chrome/browser/search_engines/template_url.h" | 8 #include "chrome/browser/search_engines/template_url.h" |
| 9 #include "chrome/browser/webdata/keyword_table.h" | 9 #include "chrome/browser/webdata/keyword_table.h" |
| 10 #include "chrome/browser/webdata/logins_table.h" | 10 #include "chrome/browser/webdata/logins_table.h" |
| 11 #include "chrome/browser/webdata/token_service_table.h" | 11 #include "chrome/browser/webdata/token_service_table.h" |
| 12 #include "chrome/browser/webdata/web_apps_table.h" | 12 #include "chrome/browser/webdata/web_apps_table.h" |
| 13 #include "chrome/browser/webdata/web_database_service.h" | |
| 14 #include "chrome/browser/webdata/web_intents_table.h" | 13 #include "chrome/browser/webdata/web_intents_table.h" |
| 15 #include "chrome/common/chrome_notification_types.h" | 14 #include "chrome/common/chrome_notification_types.h" |
| 15 #include "components/webdata/common/web_database_service.h" |
| 16 #include "content/public/browser/notification_details.h" | 16 #include "content/public/browser/notification_details.h" |
| 17 #include "content/public/browser/notification_service.h" | 17 #include "content/public/browser/notification_service.h" |
| 18 #include "content/public/browser/notification_source.h" | 18 #include "content/public/browser/notification_source.h" |
| 19 #include "third_party/skia/include/core/SkBitmap.h" | 19 #include "third_party/skia/include/core/SkBitmap.h" |
| 20 | 20 |
| 21 //////////////////////////////////////////////////////////////////////////////// | 21 //////////////////////////////////////////////////////////////////////////////// |
| 22 // | 22 // |
| 23 // WebDataService implementation. | 23 // WebDataService implementation. |
| 24 // | 24 // |
| 25 //////////////////////////////////////////////////////////////////////////////// | 25 //////////////////////////////////////////////////////////////////////////////// |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 } | 258 } |
| 259 return WebDatabase::COMMIT_NOT_NEEDED; | 259 return WebDatabase::COMMIT_NOT_NEEDED; |
| 260 } | 260 } |
| 261 | 261 |
| 262 scoped_ptr<WDTypedResult> WebDataService::GetAllTokensImpl(WebDatabase* db) { | 262 scoped_ptr<WDTypedResult> WebDataService::GetAllTokensImpl(WebDatabase* db) { |
| 263 std::map<std::string, std::string> map; | 263 std::map<std::string, std::string> map; |
| 264 TokenServiceTable::FromWebDatabase(db)->GetAllTokens(&map); | 264 TokenServiceTable::FromWebDatabase(db)->GetAllTokens(&map); |
| 265 return scoped_ptr<WDTypedResult>( | 265 return scoped_ptr<WDTypedResult>( |
| 266 new WDResult<std::map<std::string, std::string> >(TOKEN_RESULT, map)); | 266 new WDResult<std::map<std::string, std::string> >(TOKEN_RESULT, map)); |
| 267 } | 267 } |
| OLD | NEW |