From fd8927eaad03825948cecb2ddf6c543b906fd3b8 Mon Sep 17 00:00:00 2001 From: SeungSeop Park Date: Tue, 19 Jan 2016 18:10:17 +0900 Subject: [PATCH] fixup! [M48_2564] Chromium upversion to m48_2564 branch Fix warnings of '-Wunused-variable'. Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=15496 Reviewed by: a1.gomes, msu.koo, sns.park Change-Id: I6063531c4a9e67277765b3e2475156e8dec1f9a2 Signed-off-by: SeungSeop Park --- .../chromium_impl/content/browser/selection/selection_controller_efl.cc | 2 +- .../chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc | 2 +- tizen_src/ewk/efl_integration/eweb_view.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc index 89ad722..06b74e2 100644 --- a/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc +++ b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc @@ -197,8 +197,8 @@ void SelectionControllerEfl::UpdateSelectionData(const base::string16& text) { bool SelectionControllerEfl::ClearSelectionViaEWebView() { if (GetSelectionStatus()) { - RenderViewHostImpl* rvhi = static_cast(web_contents_.GetRenderViewHost()); #if !defined(EWK_BRINGUP) + RenderViewHostImpl* rvhi = static_cast(web_contents_.GetRenderViewHost()); // [M48_2564] Temporary disabling the codes for switching to new chromium // FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=15385 rvhi->ExecuteEditCommand("Unselect", ""); diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc index 2231546..1733a9c 100644 --- a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc +++ b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc @@ -327,9 +327,9 @@ WebContents* WebContentsImplEfl::HandleNewWebContentsCreate( // will be shown immediately). if (!params.opener_suppressed) { if (!is_guest) { +#if !defined(EWK_BRINGUP) WebContentsView* new_view = new_contents->view_.get(); -#if !defined(EWK_BRINGUP) // [M48_2564] Temporary disabling the codes for switching to new chromium // FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=15384 // TODO(brettw): It seems bogus that we have to call this function on the diff --git a/tizen_src/ewk/efl_integration/eweb_view.cc b/tizen_src/ewk/efl_integration/eweb_view.cc index c8407b3..04615f1 100644 --- a/tizen_src/ewk/efl_integration/eweb_view.cc +++ b/tizen_src/ewk/efl_integration/eweb_view.cc @@ -446,9 +446,9 @@ void EWebView::ExecuteEditCommand(const char* command, const char* value) { value = (value == NULL) ? "" : value; +#if !defined(EWK_BRINGUP) RenderViewHostImpl* rvhi = static_cast(web_contents_->GetRenderViewHost()); -#if !defined(EWK_BRINGUP) // [M48_2564] Temporary disabling the codes for switching to new chromium // FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=15385 rvhi->ExecuteEditCommand(command, value); -- 2.7.4