summaryrefslogtreecommitdiffstats
path: root/pdf
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2014-10-29 19:10:00 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-30 02:10:20 +0000
commitef3e4e6cff826927f51cfc74c6d84196e663dfeb (patch)
tree54f53c889e962fda5195498a4e95651d9cee2013 /pdf
parentf20e4ae7bd3c773f2009fb86cdab9f492955b173 (diff)
downloadchromium_src-ef3e4e6cff826927f51cfc74c6d84196e663dfeb.zip
chromium_src-ef3e4e6cff826927f51cfc74c6d84196e663dfeb.tar.gz
chromium_src-ef3e4e6cff826927f51cfc74c6d84196e663dfeb.tar.bz2
Add a few missing overrides found by a new clang warning.
Namely, -Winconsistent-missing-override. While here, also remove "virtual" from the functions I'm marking override, like our new override style dictates. No behavior change. BUG=428099,417463 Review URL: https://codereview.chromium.org/690613005 Cr-Commit-Position: refs/heads/master@{#302018}
Diffstat (limited to 'pdf')
-rw-r--r--pdf/instance.h96
-rw-r--r--pdf/out_of_process_instance.h88
2 files changed, 92 insertions, 92 deletions
diff --git a/pdf/instance.h b/pdf/instance.h
index d39ba40..f1997e8 100644
--- a/pdf/instance.h
+++ b/pdf/instance.h
@@ -129,56 +129,56 @@ class Instance : public pp::InstancePrivate,
void OnPrint(int32_t);
// PDFEngine::Client implementation.
- virtual void DocumentSizeUpdated(const pp::Size& size);
- virtual void Invalidate(const pp::Rect& rect);
- virtual void Scroll(const pp::Point& point);
- virtual void ScrollToX(int position);
- virtual void ScrollToY(int position);
- virtual void ScrollToPage(int page);
- virtual void NavigateTo(const std::string& url, bool open_in_new_tab);
- virtual void UpdateCursor(PP_CursorType_Dev cursor);
- virtual void UpdateTickMarks(const std::vector<pp::Rect>& tickmarks);
- virtual void NotifyNumberOfFindResultsChanged(int total, bool final_result);
- virtual void NotifySelectedFindResultChanged(int current_find_index);
- virtual void GetDocumentPassword(
- pp::CompletionCallbackWithOutput<pp::Var> callback);
- virtual void Alert(const std::string& message);
- virtual bool Confirm(const std::string& message);
- virtual std::string Prompt(const std::string& question,
- const std::string& default_answer);
- virtual std::string GetURL();
- virtual void Email(const std::string& to,
- const std::string& cc,
- const std::string& bcc,
- const std::string& subject,
- const std::string& body);
- virtual void Print();
- virtual void SubmitForm(const std::string& url,
- const void* data,
- int length);
- virtual std::string ShowFileSelectionDialog();
- virtual pp::URLLoader CreateURLLoader();
- virtual void ScheduleCallback(int id, int delay_in_ms);
- virtual void SearchString(const base::char16* string,
- const base::char16* term,
- bool case_sensitive,
- std::vector<SearchStringResult>* results);
- virtual void DocumentPaintOccurred();
- virtual void DocumentLoadComplete(int page_count);
- virtual void DocumentLoadFailed();
- virtual pp::Instance* GetPluginInstance();
- virtual void DocumentHasUnsupportedFeature(const std::string& feature);
- virtual void DocumentLoadProgress(uint32 available, uint32 doc_size);
- virtual void FormTextFieldFocusChange(bool in_focus);
- virtual bool IsPrintPreview();
+ void DocumentSizeUpdated(const pp::Size& size) override;
+ void Invalidate(const pp::Rect& rect) override;
+ void Scroll(const pp::Point& point) override;
+ void ScrollToX(int position) override;
+ void ScrollToY(int position) override;
+ void ScrollToPage(int page) override;
+ void NavigateTo(const std::string& url, bool open_in_new_tab) override;
+ void UpdateCursor(PP_CursorType_Dev cursor) override;
+ void UpdateTickMarks(const std::vector<pp::Rect>& tickmarks) override;
+ void NotifyNumberOfFindResultsChanged(int total, bool final_result) override;
+ void NotifySelectedFindResultChanged(int current_find_index) override;
+ void GetDocumentPassword(
+ pp::CompletionCallbackWithOutput<pp::Var> callback) override;
+ void Alert(const std::string& message) override;
+ bool Confirm(const std::string& message) override;
+ std::string Prompt(const std::string& question,
+ const std::string& default_answer) override;
+ std::string GetURL() override;
+ void Email(const std::string& to,
+ const std::string& cc,
+ const std::string& bcc,
+ const std::string& subject,
+ const std::string& body) override;
+ void Print() override;
+ void SubmitForm(const std::string& url,
+ const void* data,
+ int length) override;
+ std::string ShowFileSelectionDialog();
+ pp::URLLoader CreateURLLoader() override;
+ void ScheduleCallback(int id, int delay_in_ms) override;
+ void SearchString(const base::char16* string,
+ const base::char16* term,
+ bool case_sensitive,
+ std::vector<SearchStringResult>* results) override;
+ void DocumentPaintOccurred() override;
+ void DocumentLoadComplete(int page_count) override;
+ void DocumentLoadFailed() override;
+ pp::Instance* GetPluginInstance() override;
+ void DocumentHasUnsupportedFeature(const std::string& feature) override;
+ void DocumentLoadProgress(uint32 available, uint32 doc_size) override;
+ void FormTextFieldFocusChange(bool in_focus) override;
+ bool IsPrintPreview() override;
// ControlOwner implementation.
- virtual void OnEvent(uint32 control_id, uint32 event_id, void* data);
- virtual void Invalidate(uint32 control_id, const pp::Rect& rc);
- virtual uint32 ScheduleTimer(uint32 control_id, uint32 timeout_ms);
- virtual void SetEventCapture(uint32 control_id, bool set_capture);
- virtual void SetCursor(uint32 control_id, PP_CursorType_Dev cursor_type);
- virtual pp::Instance* GetInstance();
+ void OnEvent(uint32 control_id, uint32 event_id, void* data) override;
+ void Invalidate(uint32 control_id, const pp::Rect& rc) override;
+ uint32 ScheduleTimer(uint32 control_id, uint32 timeout_ms) override;
+ void SetEventCapture(uint32 control_id, bool set_capture) override;
+ void SetCursor(uint32 control_id, PP_CursorType_Dev cursor_type) override;
+ pp::Instance* GetInstance() override;
bool dont_paint() const { return dont_paint_; }
void set_dont_paint(bool dont_paint) { dont_paint_ = dont_paint; }
diff --git a/pdf/out_of_process_instance.h b/pdf/out_of_process_instance.h
index 050f361..2779020 100644
--- a/pdf/out_of_process_instance.h
+++ b/pdf/out_of_process_instance.h
@@ -91,52 +91,52 @@ class OutOfProcessInstance : public pp::Instance,
void OnPrint(int32_t);
// PDFEngine::Client implementation.
- virtual void DocumentSizeUpdated(const pp::Size& size);
- virtual void Invalidate(const pp::Rect& rect);
- virtual void Scroll(const pp::Point& point);
- virtual void ScrollToX(int position);
- virtual void ScrollToY(int position);
- virtual void ScrollToPage(int page);
- virtual void NavigateTo(const std::string& url, bool open_in_new_tab);
- virtual void UpdateCursor(PP_CursorType_Dev cursor);
- virtual void UpdateTickMarks(const std::vector<pp::Rect>& tickmarks);
- virtual void NotifyNumberOfFindResultsChanged(int total, bool final_result);
- virtual void NotifySelectedFindResultChanged(int current_find_index);
- virtual void GetDocumentPassword(
- pp::CompletionCallbackWithOutput<pp::Var> callback);
- virtual void Alert(const std::string& message);
- virtual bool Confirm(const std::string& message);
- virtual std::string Prompt(const std::string& question,
- const std::string& default_answer);
- virtual std::string GetURL();
- virtual void Email(const std::string& to,
- const std::string& cc,
- const std::string& bcc,
- const std::string& subject,
- const std::string& body);
- virtual void Print();
- virtual void SubmitForm(const std::string& url,
- const void* data,
- int length);
- virtual std::string ShowFileSelectionDialog();
- virtual pp::URLLoader CreateURLLoader();
- virtual void ScheduleCallback(int id, int delay_in_ms);
- virtual void SearchString(const base::char16* string,
- const base::char16* term,
- bool case_sensitive,
- std::vector<SearchStringResult>* results);
- virtual void DocumentPaintOccurred();
- virtual void DocumentLoadComplete(int page_count);
- virtual void DocumentLoadFailed();
- virtual pp::Instance* GetPluginInstance();
- virtual void DocumentHasUnsupportedFeature(const std::string& feature);
- virtual void DocumentLoadProgress(uint32 available, uint32 doc_size);
- virtual void FormTextFieldFocusChange(bool in_focus);
- virtual bool IsPrintPreview();
+ void DocumentSizeUpdated(const pp::Size& size) override;
+ void Invalidate(const pp::Rect& rect) override;
+ void Scroll(const pp::Point& point) override;
+ void ScrollToX(int position) override;
+ void ScrollToY(int position) override;
+ void ScrollToPage(int page) override;
+ void NavigateTo(const std::string& url, bool open_in_new_tab) override;
+ void UpdateCursor(PP_CursorType_Dev cursor) override;
+ void UpdateTickMarks(const std::vector<pp::Rect>& tickmarks) override;
+ void NotifyNumberOfFindResultsChanged(int total, bool final_result) override;
+ void NotifySelectedFindResultChanged(int current_find_index) override;
+ void GetDocumentPassword(
+ pp::CompletionCallbackWithOutput<pp::Var> callback) override;
+ void Alert(const std::string& message) override;
+ bool Confirm(const std::string& message) override;
+ std::string Prompt(const std::string& question,
+ const std::string& default_answer) override;
+ std::string GetURL() override;
+ void Email(const std::string& to,
+ const std::string& cc,
+ const std::string& bcc,
+ const std::string& subject,
+ const std::string& body) override;
+ void Print() override;
+ void SubmitForm(const std::string& url,
+ const void* data,
+ int length) override;
+ std::string ShowFileSelectionDialog() override;
+ pp::URLLoader CreateURLLoader() override;
+ void ScheduleCallback(int id, int delay_in_ms) override;
+ void SearchString(const base::char16* string,
+ const base::char16* term,
+ bool case_sensitive,
+ std::vector<SearchStringResult>* results) override;
+ void DocumentPaintOccurred() override;
+ void DocumentLoadComplete(int page_count) override;
+ void DocumentLoadFailed() override;
+ pp::Instance* GetPluginInstance() override;
+ void DocumentHasUnsupportedFeature(const std::string& feature) override;
+ void DocumentLoadProgress(uint32 available, uint32 doc_size) override;
+ void FormTextFieldFocusChange(bool in_focus) override;
+ bool IsPrintPreview() override;
// PreviewModeClient::Client implementation.
- virtual void PreviewDocumentLoadComplete() override;
- virtual void PreviewDocumentLoadFailed() override;
+ void PreviewDocumentLoadComplete() override;
+ void PreviewDocumentLoadFailed() override;
// Helper functions for implementing PPP_PDF.
void RotateClockwise();