Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / search_engines / template_url_table_model.cc

diff --git a/src/chrome/browser/ui/search_engines/template_url_table_model.cc b/src/chrome/browser/ui/search_engines/template_url_table_model.cc
index ae2a976..e7058f7 100644 (file)
--- a/src/chrome/browser/ui/search_engines/template_url_table_model.cc
+++ b/src/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
-#include "chrome/common/favicon/favicon_types.h"
+#include "components/favicon_base/favicon_types.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ -96,13 +96,15 @@ class ModelEntry {
     }
     load_state_ = LOADING;
     favicon_service->GetFaviconImage(
-        favicon_url, chrome::FAVICON, gfx::kFaviconSize,
-        base::Bind(&ModelEntry::OnFaviconDataAvailable,
-                   base::Unretained(this)),
+        favicon_url,
+        favicon_base::FAVICON,
+        gfx::kFaviconSize,
+        base::Bind(&ModelEntry::OnFaviconDataAvailable, base::Unretained(this)),
         &tracker_);
   }
 
-  void OnFaviconDataAvailable(const chrome::FaviconImageResult& image_result) {
+  void OnFaviconDataAvailable(
+      const favicon_base::FaviconImageResult& image_result) {
     load_state_ = LOADED;
     if (!image_result.image.IsEmpty()) {
       favicon_ = image_result.image.AsImageSkia();
@@ -340,7 +342,7 @@ int TemplateURLTableModel::MakeDefaultTemplateURL(int index) {
     return -1;
 
   template_url_service_->RemoveObserver(this);
-  template_url_service_->SetDefaultSearchProvider(keyword);
+  template_url_service_->SetUserSelectedDefaultSearchProvider(keyword);
   template_url_service_->AddObserver(this);
 
   // The formatting of the default engine is different; notify the table that