From d50eeb04d559fecda873d7ebe014a08a85933fe8 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 15 Dec 2014 17:15:56 -0800 Subject: [PATCH] Upgrade cpplint --- atom/browser/api/atom_api_web_contents.h | 2 +- atom/browser/atom_browser_context.h | 4 +-- ...atom_speech_recognition_manager_delegate.h | 32 +++++++++---------- atom/browser/native_window.cc | 3 +- .../crash_reporter/win/crash_service.cc | 2 +- vendor/depot_tools | 2 +- 6 files changed, 23 insertions(+), 22 deletions(-) diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h index 4bb798c90de..a95146dba31 100644 --- a/atom/browser/api/atom_api_web_contents.h +++ b/atom/browser/api/atom_api_web_contents.h @@ -92,7 +92,7 @@ class WebContents : public mate::EventEmitter, ~WebContents(); // mate::Wrappable: - virtual mate::ObjectTemplateBuilder GetObjectTemplateBuilder( + mate::ObjectTemplateBuilder GetObjectTemplateBuilder( v8::Isolate* isolate) override; // content::WebContentsDelegate: diff --git a/atom/browser/atom_browser_context.h b/atom/browser/atom_browser_context.h index be3029759e8..8dd2dc7e0bc 100644 --- a/atom/browser/atom_browser_context.h +++ b/atom/browser/atom_browser_context.h @@ -23,12 +23,12 @@ class AtomBrowserContext : public brightray::BrowserContext { static AtomBrowserContext* Get(); // brightray::URLRequestContextGetter::Delegate: - virtual net::URLRequestJobFactory* CreateURLRequestJobFactory( + net::URLRequestJobFactory* CreateURLRequestJobFactory( content::ProtocolHandlerMap* handlers, content::URLRequestInterceptorScopedVector* interceptors) override; // content::BrowserContext: - virtual content::BrowserPluginGuestManager* GetGuestManager() override; + content::BrowserPluginGuestManager* GetGuestManager() override; AtomURLRequestJobFactory* job_factory() const { return job_factory_; } diff --git a/atom/browser/atom_speech_recognition_manager_delegate.h b/atom/browser/atom_speech_recognition_manager_delegate.h index 7e737a31bf0..ec31e227baf 100644 --- a/atom/browser/atom_speech_recognition_manager_delegate.h +++ b/atom/browser/atom_speech_recognition_manager_delegate.h @@ -20,28 +20,28 @@ class AtomSpeechRecognitionManagerDelegate virtual ~AtomSpeechRecognitionManagerDelegate(); // content::SpeechRecognitionEventListener: - virtual void OnRecognitionStart(int session_id) override; - virtual void OnAudioStart(int session_id) override; - virtual void OnEnvironmentEstimationComplete(int session_id) override; - virtual void OnSoundStart(int session_id) override; - virtual void OnSoundEnd(int session_id) override; - virtual void OnAudioEnd(int session_id) override; - virtual void OnRecognitionEnd(int session_id) override; - virtual void OnRecognitionResults( + void OnRecognitionStart(int session_id) override; + void OnAudioStart(int session_id) override; + void OnEnvironmentEstimationComplete(int session_id) override; + void OnSoundStart(int session_id) override; + void OnSoundEnd(int session_id) override; + void OnAudioEnd(int session_id) override; + void OnRecognitionEnd(int session_id) override; + void OnRecognitionResults( int session_id, const content::SpeechRecognitionResults& result) override; - virtual void OnRecognitionError( + void OnRecognitionError( int session_id, const content::SpeechRecognitionError& error) override; - virtual void OnAudioLevelsChange(int session_id, float volume, - float noise_volume) override; + void OnAudioLevelsChange(int session_id, float volume, + float noise_volume) override; // content::SpeechRecognitionManagerDelegate: - virtual void GetDiagnosticInformation(bool* can_report_metrics, - std::string* hardware_info) override; - virtual void CheckRecognitionIsAllowed( + void GetDiagnosticInformation(bool* can_report_metrics, + std::string* hardware_info) override; + void CheckRecognitionIsAllowed( int session_id, base::Callback callback) override; - virtual content::SpeechRecognitionEventListener* GetEventListener() override; - virtual bool FilterProfanities(int render_process_id) override; + content::SpeechRecognitionEventListener* GetEventListener() override; + bool FilterProfanities(int render_process_id) override; private: DISALLOW_COPY_AND_ASSIGN(AtomSpeechRecognitionManagerDelegate); diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc index 1aa77a47838..d807c1ba7cd 100644 --- a/atom/browser/native_window.cc +++ b/atom/browser/native_window.cc @@ -439,9 +439,10 @@ void NativeWindow::OverrideWebkitPrefs(const GURL& url, prefs->experimental_webgl_enabled = b; if (web_preferences_.Get("webaudio", &b)) prefs->webaudio_enabled = b; - if (web_preferences_.Get("extra-plugin-dirs", &list)) + if (web_preferences_.Get("extra-plugin-dirs", &list)) { for (size_t i = 0; i < list.size(); ++i) content::PluginService::GetInstance()->AddExtraPluginDir(list[i]); + } } void NativeWindow::NotifyWindowClosed() { diff --git a/atom/common/crash_reporter/win/crash_service.cc b/atom/common/crash_reporter/win/crash_service.cc index ee77eb07f66..626ab2f53c8 100644 --- a/atom/common/crash_reporter/win/crash_service.cc +++ b/atom/common/crash_reporter/win/crash_service.cc @@ -456,7 +456,7 @@ DWORD CrashService::AsyncSendDump(void* context) { default: report_id = L""; break; - }; + } } VLOG(1) << "dump for pid =" << info->pid << " crash2 id =" << report_id; diff --git a/vendor/depot_tools b/vendor/depot_tools index a738935a12e..4fa73b8ca68 160000 --- a/vendor/depot_tools +++ b/vendor/depot_tools @@ -1 +1 @@ -Subproject commit a738935a12e7ef428b3a852f1f3eca6bbfa0182b +Subproject commit 4fa73b8ca6899bc69577932b80145a6bf07e4424