diff --git a/atom/browser/api/frame_subscriber.cc b/atom/browser/api/frame_subscriber.cc index 87f9ef1428b3..e532cb43122e 100644 --- a/atom/browser/api/frame_subscriber.cc +++ b/atom/browser/api/frame_subscriber.cc @@ -45,7 +45,7 @@ bool FrameSubscriber::ShouldCaptureFrame( gfx::Size view_size = rect.size(); gfx::Size bitmap_size = view_size; - const gfx::NativeView native_view = view_->GetNativeView(); + gfx::NativeView native_view = view_->GetNativeView(); const float scale = display::Screen::GetScreen()->GetDisplayNearestView(native_view) .device_scale_factor(); diff --git a/atom/browser/lib/bluetooth_chooser.h b/atom/browser/lib/bluetooth_chooser.h index fbc97c981519..fe628ca6aabd 100644 --- a/atom/browser/lib/bluetooth_chooser.h +++ b/atom/browser/lib/bluetooth_chooser.h @@ -33,7 +33,7 @@ class BluetoothChooser : public content::BluetoothChooser { bool is_gatt_connected, bool is_paired, int signal_strength_level) override; - void RemoveDevice(const std::string& device_id) override; + void RemoveDevice(const std::string& device_id); private: std::vector device_list_; diff --git a/atom/browser/osr/osr_render_widget_host_view.h b/atom/browser/osr/osr_render_widget_host_view.h index e962c7347d45..24ede965d2ca 100644 --- a/atom/browser/osr/osr_render_widget_host_view.h +++ b/atom/browser/osr/osr_render_widget_host_view.h @@ -113,8 +113,6 @@ class OffScreenRenderWidgetHostView #endif // defined(OS_MACOSX) // content::RenderWidgetHostViewBase: - void OnSwapCompositorFrame(uint32_t, cc::CompositorFrame) - override; void ClearCompositorFrame(void) override; void InitAsPopup(content::RenderWidgetHostView *rwhv, const gfx::Rect& rect) override; diff --git a/atom/renderer/api/atom_api_spell_check_client.h b/atom/renderer/api/atom_api_spell_check_client.h index 60008bb536ec..b8ff4cf089fe 100644 --- a/atom/renderer/api/atom_api_spell_check_client.h +++ b/atom/renderer/api/atom_api_spell_check_client.h @@ -11,6 +11,7 @@ #include "base/callback.h" #include "chrome/renderer/spellchecker/spellcheck_worditerator.h" #include "native_mate/scoped_persistent.h" +#include "third_party/WebKit/public/platform/WebVector.h" #include "third_party/WebKit/public/web/WebSpellCheckClient.h" namespace blink { @@ -38,7 +39,7 @@ class SpellCheckClient : public blink::WebSpellCheckClient { blink::WebVector* optionalSuggestions) override; void RequestCheckingOfText( const blink::WebString& textToCheck, - blink::WebTextCheckingCompletion* completionCallback) override; + blink::WebTextCheckingResult completionCallback) override; void ShowSpellingUI(bool show) override; bool IsShowingSpellingUI() override; void UpdateSpellingUIWithMisspelledWord( diff --git a/brightray/browser/devtools_embedder_message_dispatcher.cc b/brightray/browser/devtools_embedder_message_dispatcher.cc index d8c550460414..8791bfbd2ca6 100644 --- a/brightray/browser/devtools_embedder_message_dispatcher.cc +++ b/brightray/browser/devtools_embedder_message_dispatcher.cc @@ -69,7 +69,7 @@ template struct ParamTuple { bool Parse(const base::ListValue& list, const base::ListValue::const_iterator& it) { - return it != list.end() && GetValue(**it, &head) && + return it != list.end() && GetValue(*it, &head) && tail.Parse(list, it + 1); }