Upstream version 7.35.144.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / gtk / zoom_bubble_gtk.cc

diff --git a/src/chrome/browser/ui/gtk/zoom_bubble_gtk.cc b/src/chrome/browser/ui/gtk/zoom_bubble_gtk.cc
index cc66370..2cd8309 100644 (file)
--- a/src/chrome/browser/ui/gtk/zoom_bubble_gtk.cc
+++ b/src/chrome/browser/ui/gtk/zoom_bubble_gtk.cc
@@ -102,7 +102,7 @@ ZoomBubbleGtk::ZoomBubbleGtk(GtkWidget* anchor,
   ZoomController* zoom_controller =
       ZoomController::FromWebContents(web_contents_);
   int zoom_percent = zoom_controller->zoom_percent();
-  std::string percentage_text = UTF16ToUTF8(l10n_util::GetStringFUTF16Int(
+  std::string percentage_text = base::UTF16ToUTF8(l10n_util::GetStringFUTF16Int(
       IDS_TOOLTIP_ZOOM, zoom_percent));
   label_ = theme_service->BuildLabel(percentage_text, ui::kGdkBlack);
   gtk_widget_modify_font(label_, pango_font_description_from_string("13"));
@@ -178,9 +178,10 @@ void ZoomBubbleGtk::Refresh() {
   ZoomController* zoom_controller =
       ZoomController::FromWebContents(web_contents_);
   int zoom_percent = zoom_controller->zoom_percent();
-  string16 text =
+  base::string16 text =
       l10n_util::GetStringFUTF16Int(IDS_TOOLTIP_ZOOM, zoom_percent);
-  gtk_label_set_text(GTK_LABEL(g_bubble->label_), UTF16ToUTF8(text).c_str());
+  gtk_label_set_text(GTK_LABEL(g_bubble->label_),
+                     base::UTF16ToUTF8(text).c_str());
   StartTimerIfNecessary();
 }
 
@@ -218,7 +219,7 @@ void ZoomBubbleGtk::OnSetDefaultLinkClick(GtkWidget* widget) {
   double default_zoom_level = Profile::FromBrowserContext(
       web_contents_->GetBrowserContext())->GetPrefs()->GetDouble(
           prefs::kDefaultZoomLevel);
-  web_contents_->GetRenderViewHost()->SetZoomLevel(default_zoom_level);
+  web_contents_->SetZoomLevel(default_zoom_level);
 }
 
 gboolean ZoomBubbleGtk::OnMouseEnter(GtkWidget* widget,