From 27cee90e5ee789134cde8ab8ea5effb109658394 Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Tue, 17 Apr 2018 16:47:47 -0700 Subject: [PATCH] [chromium-style] move methods out of headers --- atom/browser/native_window.cc | 4 ++++ atom/browser/native_window.h | 2 +- atom/browser/ui/atom_menu_model.cc | 6 ++++++ atom/browser/ui/atom_menu_model.h | 5 +---- atom/browser/ui/views/autofill_popup_view.cc | 15 +++++++++++++++ atom/browser/ui/views/autofill_popup_view.h | 15 ++++----------- brightray/browser/browser_client.cc | 7 +++++++ brightray/browser/browser_client.h | 4 +--- brightray/browser/url_request_context_getter.cc | 5 +++++ brightray/browser/url_request_context_getter.h | 4 +--- 10 files changed, 45 insertions(+), 22 deletions(-) diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc index bbffdac05c..e1468b02a9 100644 --- a/atom/browser/native_window.cc +++ b/atom/browser/native_window.cc @@ -155,6 +155,10 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) { Show(); } +bool NativeWindow::IsClosed() const { + return is_closed_; +} + void NativeWindow::SetSize(const gfx::Size& size, bool animate) { SetBounds(gfx::Rect(GetPosition(), size), animate); } diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h index 6e01799580..e723dad5d1 100644 --- a/atom/browser/native_window.h +++ b/atom/browser/native_window.h @@ -63,7 +63,7 @@ class NativeWindow : public base::SupportsUserData { virtual void Close() = 0; virtual void CloseImmediately() = 0; - virtual bool IsClosed() const { return is_closed_; } + virtual bool IsClosed() const; virtual void Focus(bool focus) = 0; virtual bool IsFocused() = 0; virtual void Show() = 0; diff --git a/atom/browser/ui/atom_menu_model.cc b/atom/browser/ui/atom_menu_model.cc index e2453133ad..83e23c42ed 100644 --- a/atom/browser/ui/atom_menu_model.cc +++ b/atom/browser/ui/atom_menu_model.cc @@ -8,6 +8,12 @@ namespace atom { +bool AtomMenuModel::Delegate::GetAcceleratorForCommandId(int command_id, + ui::Accelerator* accelerator) const { + return GetAcceleratorForCommandIdWithParams( + command_id, false, accelerator); +} + AtomMenuModel::AtomMenuModel(Delegate* delegate) : ui::SimpleMenuModel(delegate), delegate_(delegate) {} diff --git a/atom/browser/ui/atom_menu_model.h b/atom/browser/ui/atom_menu_model.h index 2d45034329..e77082adcb 100644 --- a/atom/browser/ui/atom_menu_model.h +++ b/atom/browser/ui/atom_menu_model.h @@ -26,10 +26,7 @@ class AtomMenuModel : public ui::SimpleMenuModel { private: // ui::SimpleMenuModel::Delegate: bool GetAcceleratorForCommandId(int command_id, - ui::Accelerator* accelerator) const { - return GetAcceleratorForCommandIdWithParams(command_id, false, - accelerator); - } + ui::Accelerator* accelerator) const override; }; class Observer { diff --git a/atom/browser/ui/views/autofill_popup_view.cc b/atom/browser/ui/views/autofill_popup_view.cc index fc8e31ee2e..bad75ec9b1 100644 --- a/atom/browser/ui/views/autofill_popup_view.cc +++ b/atom/browser/ui/views/autofill_popup_view.cc @@ -18,6 +18,11 @@ namespace atom { +void AutofillPopupChildView::GetAccessibleNodeData(ui::AXNodeData* node_data) { + node_data->role = ui::AX_ROLE_MENU_ITEM; + node_data->SetName(suggestion_); +} + AutofillPopupView::AutofillPopupView(AutofillPopup* popup, views::Widget* parent_widget) : popup_(popup), @@ -128,6 +133,16 @@ void AutofillPopupView::OnSuggestionsChanged() { DoUpdateBoundsAndRedrawPopup(); } +int AutofillPopupView::GetDragOperationsForView( + views::View*, const gfx::Point&) { + return ui::DragDropTypes::DRAG_NONE; +} + +bool AutofillPopupView::CanStartDragForView( + views::View*, const gfx::Point&, const gfx::Point&) { + return false; +} + void AutofillPopupView::OnSelectedRowChanged( base::Optional previous_row_selection, base::Optional current_row_selection) { diff --git a/atom/browser/ui/views/autofill_popup_view.h b/atom/browser/ui/views/autofill_popup_view.h index 1e66ba7bc9..a1f4ce6a7b 100644 --- a/atom/browser/ui/views/autofill_popup_view.h +++ b/atom/browser/ui/views/autofill_popup_view.h @@ -42,10 +42,7 @@ class AutofillPopupChildView : public views::View { ~AutofillPopupChildView() override {} // views::Views implementation - void GetAccessibleNodeData(ui::AXNodeData* node_data) override { - node_data->role = ui::AX_ROLE_MENU_ITEM; - node_data->SetName(suggestion_); - } + void GetAccessibleNodeData(ui::AXNodeData* node_data) override; base::string16 suggestion_; @@ -70,15 +67,11 @@ class AutofillPopupView : public views::WidgetDelegateView, void WriteDragDataForView(views::View*, const gfx::Point&, - ui::OSExchangeData*) override {} - int GetDragOperationsForView(views::View*, const gfx::Point&) override { - return ui::DragDropTypes::DRAG_NONE; - } + ui::OSExchangeData*) override; + int GetDragOperationsForView(views::View*, const gfx::Point&) override; bool CanStartDragForView(views::View*, const gfx::Point&, - const gfx::Point&) override { - return false; - } + const gfx::Point&) override; private: friend class AutofillPopup; diff --git a/brightray/browser/browser_client.cc b/brightray/browser/browser_client.cc index f675f73218..ea82524810 100644 --- a/brightray/browser/browser_client.cc +++ b/brightray/browser/browser_client.cc @@ -58,6 +58,13 @@ BrowserClient::BrowserClient() : browser_main_parts_(nullptr) { BrowserClient::~BrowserClient() {} + +void BrowserClient::WebNotificationAllowed( + int render_process_id, + const base::Callback& callback) { + callback.Run(false, true); +} + NotificationPresenter* BrowserClient::GetNotificationPresenter() { if (!notification_presenter_) { // Create a new presenter if on OS X, Linux, or Windows 7+ diff --git a/brightray/browser/browser_client.h b/brightray/browser/browser_client.h index 73b0e507ca..5c8ecd397c 100644 --- a/brightray/browser/browser_client.h +++ b/brightray/browser/browser_client.h @@ -32,9 +32,7 @@ class BrowserClient : public content::ContentBrowserClient { // Subclasses should override this to enable or disable WebNotification. virtual void WebNotificationAllowed( int render_process_id, - const base::Callback& callback) { - callback.Run(false, true); - } + const base::Callback& callback); // Subclasses that override this (e.g., to provide their own protocol // handlers) should call this implementation after doing their own work. diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc index b00bb05e3d..c14b2b9707 100644 --- a/brightray/browser/url_request_context_getter.cc +++ b/brightray/browser/url_request_context_getter.cc @@ -60,6 +60,11 @@ std::string URLRequestContextGetter::Delegate::GetUserAgent() { return base::EmptyString(); } +std::unique_ptr +URLRequestContextGetter::Delegate::CreateNetworkDelegate() { + return nullptr; +} + std::unique_ptr URLRequestContextGetter::Delegate::CreateURLRequestJobFactory( content::ProtocolHandlerMap* protocol_handlers) { diff --git a/brightray/browser/url_request_context_getter.h b/brightray/browser/url_request_context_getter.h index 729d3882e0..0cfd921bab 100644 --- a/brightray/browser/url_request_context_getter.h +++ b/brightray/browser/url_request_context_getter.h @@ -48,9 +48,7 @@ class URLRequestContextGetter : public net::URLRequestContextGetter { Delegate() {} virtual ~Delegate() {} - virtual std::unique_ptr CreateNetworkDelegate() { - return nullptr; - } + virtual std::unique_ptr CreateNetworkDelegate(); virtual std::string GetUserAgent(); virtual std::unique_ptr CreateURLRequestJobFactory(content::ProtocolHandlerMap* protocol_handlers);