In M40, base/compiler_specific.h removed OVERRIDE definition.
It means compilers that do not support 'override' can not
be used to build chromium out of the box anymore.
Patch replaces OVERRIDE by override in impl. The following
scripts were used.
$ find impl -name "*.h" -print0 | xargs -0 sed -i 's/OVERRIDE/override/g'
$ find impl -name "*.cc" -print0 | xargs -0 sed -i 's/OVERRIDE/override/g'
Based on the original work of SeungSeop Park <sns.park@samsung.com>
in http://165.213.202.130:8080/#/c/71676 .
Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=8410
Reviewed by: Kangil Han, SeungSeop Park, arno renevier, mohan reddy
Change-Id: Ieddb11caaf084aa920ad9f6691eb001fa835aaf1
Signed-off-by: Antonio Gomes <a1.gomes@samsung.com>
// Called when the tab corresponding to |this| instance is activated.
void TabActivated();
// AutofillManagerDelegate implementation.
- virtual PersonalDataManager* GetPersonalDataManager() OVERRIDE;
- virtual scoped_refptr<AutofillWebDataService> GetDatabase() OVERRIDE;
- virtual PrefService* GetPrefs() OVERRIDE;
- virtual void HideRequestAutocompleteDialog() OVERRIDE;
- virtual void ShowAutofillSettings() OVERRIDE;
- virtual void ConfirmSaveCreditCard(const AutofillMetrics& metric_logger, const base::Closure& save_card_callback) OVERRIDE;
- virtual void ShowRequestAutocompleteDialog(const FormData& form, const GURL& source_url, const base::Callback<void(const FormStructure*)>& callback) OVERRIDE;
+ virtual PersonalDataManager* GetPersonalDataManager() override;
+ virtual scoped_refptr<AutofillWebDataService> GetDatabase() override;
+ virtual PrefService* GetPrefs() override;
+ virtual void HideRequestAutocompleteDialog() override;
+ virtual void ShowAutofillSettings() override;
+ virtual void ConfirmSaveCreditCard(const AutofillMetrics& metric_logger, const base::Closure& save_card_callback) override;
+ virtual void ShowRequestAutocompleteDialog(const FormData& form, const GURL& source_url, const base::Callback<void(const FormStructure*)>& callback) override;
virtual void ShowAutofillPopup(
const gfx::RectF& element_bounds,
base::i18n::TextDirection text_direction,
const std::vector<base::string16>& labels,
const std::vector<base::string16>& icons,
const std::vector<int>& identifiers,
- base::WeakPtr<AutofillPopupDelegate> delegate) OVERRIDE;
- virtual void UpdateAutofillPopupDataListValues(const std::vector<base::string16>& values, const std::vector<base::string16>& labels) OVERRIDE;
- virtual void HideAutofillPopup() OVERRIDE;
- virtual bool IsAutocompleteEnabled() OVERRIDE;
- virtual void DetectAccountCreationForms(const std::vector<autofill::FormStructure*>& forms) OVERRIDE;
+ base::WeakPtr<AutofillPopupDelegate> delegate) override;
+ virtual void UpdateAutofillPopupDataListValues(const std::vector<base::string16>& values, const std::vector<base::string16>& labels) override;
+ virtual void HideAutofillPopup() override;
+ virtual bool IsAutocompleteEnabled() override;
+ virtual void DetectAccountCreationForms(const std::vector<autofill::FormStructure*>& forms) override;
// content::WebContentsObserver implementation.
- virtual void DidNavigateMainFrame(const content::LoadCommittedDetails& details, const content::FrameNavigateParams& params) OVERRIDE;
- virtual void WebContentsDestroyed(content::WebContents* web_contents) OVERRIDE;
- virtual void WasShown() OVERRIDE;
+ virtual void DidNavigateMainFrame(const content::LoadCommittedDetails& details, const content::FrameNavigateParams& params) override;
+ virtual void WebContentsDestroyed(content::WebContents* web_contents) override;
+ virtual void WasShown() override;
void SetAutocompleteEnabled(bool enable);
void ShowSavePasswordPopup(PasswordFormManager * form_to_save);
void SetEWebView(EWebView * view) { webview_ = view; }
virtual ~PersonalDataManagerServiceImpl();
// PersonalDataManagerService:
- virtual void Shutdown() OVERRIDE;
- virtual PersonalDataManager* GetPersonalDataManager() OVERRIDE;
+ virtual void Shutdown() override;
+ virtual PersonalDataManager* GetPersonalDataManager() override;
static PersonalDataManagerServiceImpl* GetInstance() {
return Singleton<PersonalDataManagerServiceImpl>::get();
}
// content::DownloadManagerDelegate implementation.
virtual bool DetermineDownloadTarget(
content::DownloadItem*,
- const content::DownloadTargetCallback&) OVERRIDE;
+ const content::DownloadTargetCallback&) override;
virtual bool ShouldCompleteDownload(
content::DownloadItem*,
- const base::Closure&) OVERRIDE;
+ const base::Closure&) override;
virtual bool ShouldOpenDownload(
content::DownloadItem*,
- const content::DownloadOpenDelayedCallback&) OVERRIDE;
- virtual void GetNextId(const content::DownloadIdCallback&) OVERRIDE;
+ const content::DownloadOpenDelayedCallback&) override;
+ virtual void GetNextId(const content::DownloadIdCallback&) override;
};
#endif // DOWNLOAD_MANAGER_DELEGATE_EFL_H
AccessTokenStoreEfl();
// AccessTokenStore
- virtual void LoadAccessTokens(const LoadAccessTokensCallbackType& callback) OVERRIDE;
- virtual void SaveAccessToken(const GURL& server_url, const base::string16& access_token) OVERRIDE;
+ virtual void LoadAccessTokens(const LoadAccessTokensCallbackType& callback) override;
+ virtual void SaveAccessToken(const GURL& server_url, const base::string16& access_token) override;
private:
virtual ~AccessTokenStoreEfl();
public:
GeolocationPermissionContextEfl() { }
- virtual void RequestGeolocationPermission(int, int, int, const GURL&, base::Callback<void(bool)>) OVERRIDE;
+ virtual void RequestGeolocationPermission(int, int, int, const GURL&, base::Callback<void(bool)>) override;
// The renderer is cancelling a pending permission request.
- virtual void CancelGeolocationPermissionRequest(int, int, int, const GURL&) OVERRIDE;
+ virtual void CancelGeolocationPermissionRequest(int, int, int, const GURL&) override;
private:
void RequestGeolocationPermissionOnUIThread(int, int, int, const GURL&, base::Callback<void(bool)>);
static LocationProvider* Create();
- virtual bool StartProvider(bool high_accuracy) OVERRIDE;
- virtual void StopProvider() OVERRIDE;
- virtual void GetPosition(Geoposition* position) OVERRIDE;
- virtual void RequestRefresh() OVERRIDE;
- virtual void OnPermissionGranted() OVERRIDE;
+ virtual bool StartProvider(bool high_accuracy) override;
+ virtual void StopProvider() override;
+ virtual void GetPosition(Geoposition* position) override;
+ virtual void RequestRefresh() override;
+ virtual void OnPermissionGranted() override;
private:
LocationProviderEfl();
const base::string16& message_text,
const base::string16& default_prompt_text,
const DialogClosedCallback& callback,
- bool* did_suppress_message) OVERRIDE;
+ bool* did_suppress_message) override;
virtual void RunBeforeUnloadDialog(content::WebContents* web_contents,
const base::string16& message_text,
bool is_reload,
- const DialogClosedCallback& callback) OVERRIDE;
+ const DialogClosedCallback& callback) override;
virtual bool HandleJavaScriptDialog(content::WebContents* web_contents,
bool accept,
- const base::string16* prompt_override) OVERRIDE
+ const base::string16* prompt_override) override
{
NOTIMPLEMENTED();
return false;
}
- virtual void CancelActiveAndPendingDialogs(content::WebContents* web_contents) OVERRIDE
+ virtual void CancelActiveAndPendingDialogs(content::WebContents* web_contents) override
{
NOTIMPLEMENTED();
}
- virtual void WebContentsDestroyed(content::WebContents* web_contents) OVERRIDE
+ virtual void WebContentsDestroyed(content::WebContents* web_contents) override
{
NOTIMPLEMENTED();
}
virtual void Cancel();
// from ResourceDispatcherHostLoginDelegate
- virtual void OnRequestCancelled() OVERRIDE;
+ virtual void OnRequestCancelled() override;
private:
virtual ~LoginDelegateEfl();
// PasswordManagerDriver implementation.
virtual void FillPasswordForm(const autofill::PasswordFormFillData& form_data)
- OVERRIDE;
- virtual bool DidLastPageLoadEncounterSSLErrors() OVERRIDE;
- virtual bool IsOffTheRecord() OVERRIDE;
- virtual PasswordGenerationManager* GetPasswordGenerationManager() OVERRIDE;
- virtual PasswordManager* GetPasswordManager() OVERRIDE;
- virtual autofill::AutofillManager* GetAutofillManager() OVERRIDE;
+ override;
+ virtual bool DidLastPageLoadEncounterSSLErrors() override;
+ virtual bool IsOffTheRecord() override;
+ virtual PasswordGenerationManager* GetPasswordGenerationManager() override;
+ virtual PasswordManager* GetPasswordManager() override;
+ virtual autofill::AutofillManager* GetAutofillManager() override;
virtual void AllowPasswordGenerationForForm(autofill::PasswordForm* form)
- OVERRIDE;
+ override;
// content::WebContentsObserver overrides.
- virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message& message) override;
virtual void DidNavigateMainFrame(
const content::LoadCommittedDetails& details,
- const content::FrameNavigateParams& params) OVERRIDE;
+ const content::FrameNavigateParams& params) override;
private:
// Must outlive this instance.
void OnRequestDone(const std::vector<autofill::PasswordForm*>& result);
virtual void OnGetPasswordStoreResults(
- const std::vector<autofill::PasswordForm*>& results) OVERRIDE;
+ const std::vector<autofill::PasswordForm*>& results) override;
// A user opted to 'never remember' passwords for this form.
// Blacklist it so that from now on when it is seen we ignore it.
bool wait_for_username) const;
// LoginModel implementation.
- virtual void AddObserver(LoginModelObserver* observer) OVERRIDE;
- virtual void RemoveObserver(LoginModelObserver* observer) OVERRIDE;
+ virtual void AddObserver(LoginModelObserver* observer) override;
+ virtual void RemoveObserver(LoginModelObserver* observer) override;
// Mark this form as having a generated password.
void SetFormHasGeneratedPassword(const autofill::PasswordForm& form);
virtual ~PasswordManagerClientEfl();
// PasswordManagerClient implementation.
- virtual void PromptUserToSavePassword(PasswordFormManager* form_to_save) OVERRIDE;
- virtual void PasswordWasAutofilled(const autofill::PasswordFormMap& best_matches) const OVERRIDE;
- virtual void AuthenticateAutofillAndFillForm(scoped_ptr<autofill::PasswordFormFillData> fill_data) OVERRIDE;
- virtual PasswordStore* GetPasswordStore() OVERRIDE;
- virtual PasswordManagerDriver* GetDriver() OVERRIDE;
- virtual base::FieldTrial::Probability GetProbabilityForExperiment(const std::string& experiment_name) OVERRIDE;
- virtual bool IsPasswordSyncEnabled() OVERRIDE;
+ virtual void PromptUserToSavePassword(PasswordFormManager* form_to_save) override;
+ virtual void PasswordWasAutofilled(const autofill::PasswordFormMap& best_matches) const override;
+ virtual void AuthenticateAutofillAndFillForm(scoped_ptr<autofill::PasswordFormFillData> fill_data) override;
+ virtual PasswordStore* GetPasswordStore() override;
+ virtual PasswordManagerDriver* GetDriver() override;
+ virtual base::FieldTrial::Probability GetProbabilityForExperiment(const std::string& experiment_name) override;
+ virtual bool IsPasswordSyncEnabled() override;
bool IsPasswordManagerEnabled();
void SetPasswordManagerEnabled(bool enabled);
scoped_refptr<PasswordStore> GetPasswordStore();
- virtual void Shutdown() OVERRIDE;
+ virtual void Shutdown() override;
private:
scoped_refptr<PasswordStore> password_store_;
PasswordStoreFactory();
virtual ~PasswordStoreFactory();
- virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
+ virtual bool ServiceIsNULLWhileTesting() const override;
PasswordStoreService * service_;
DISALLOW_COPY_AND_ASSIGN(PasswordStoreFactory);
public:
RenderMessageFilterEfl(int);
~RenderMessageFilterEfl();
- virtual bool OnMessageReceived(const IPC::Message&) OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message&) override;
virtual void OverrideThreadForMessage(const IPC::Message&,
- content::BrowserThread::ID*) OVERRIDE;
+ content::BrowserThread::ID*) override;
private:
void OnDecideNavigationPolicy(NavigationPolicyParams, bool* handled);
explicit RenderWidgetHostViewEfl(RenderWidgetHost*, EWebView*);
// RenderWidgetHostViewBase implementation.
- virtual void InitAsChild(gfx::NativeView) OVERRIDE;
- virtual void InitAsPopup(content::RenderWidgetHostView*, const gfx::Rect&) OVERRIDE;
- virtual void InitAsFullscreen(content::RenderWidgetHostView*) OVERRIDE;
- virtual RenderWidgetHost* GetRenderWidgetHost() const OVERRIDE;
- virtual void SetSize(const gfx::Size&) OVERRIDE;
- virtual void SetBounds(const gfx::Rect&) OVERRIDE;
- virtual gfx::Vector2dF GetLastScrollOffset() const OVERRIDE;
- virtual gfx::NativeView GetNativeView() const OVERRIDE;
- virtual gfx::NativeViewId GetNativeViewId() const OVERRIDE;
- virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE;
- virtual bool IsSurfaceAvailableForCopy() const OVERRIDE;
- virtual void Show() OVERRIDE;
- virtual void Hide() OVERRIDE;
- virtual bool IsShowing() OVERRIDE;
- virtual gfx::Rect GetViewBounds() const OVERRIDE;
- virtual bool LockMouse() OVERRIDE;
- virtual void UnlockMouse() OVERRIDE;
- virtual void WasShown() OVERRIDE;
- virtual void WasHidden() OVERRIDE;
- virtual void Focus() OVERRIDE;
- virtual bool HasFocus() const OVERRIDE;
+ virtual void InitAsChild(gfx::NativeView) override;
+ virtual void InitAsPopup(content::RenderWidgetHostView*, const gfx::Rect&) override;
+ virtual void InitAsFullscreen(content::RenderWidgetHostView*) override;
+ virtual RenderWidgetHost* GetRenderWidgetHost() const override;
+ virtual void SetSize(const gfx::Size&) override;
+ virtual void SetBounds(const gfx::Rect&) override;
+ virtual gfx::Vector2dF GetLastScrollOffset() const override;
+ virtual gfx::NativeView GetNativeView() const override;
+ virtual gfx::NativeViewId GetNativeViewId() const override;
+ virtual gfx::NativeViewAccessible GetNativeViewAccessible() override;
+ virtual bool IsSurfaceAvailableForCopy() const override;
+ virtual void Show() override;
+ virtual void Hide() override;
+ virtual bool IsShowing() override;
+ virtual gfx::Rect GetViewBounds() const override;
+ virtual bool LockMouse() override;
+ virtual void UnlockMouse() override;
+ virtual void WasShown() override;
+ virtual void WasHidden() override;
+ virtual void Focus() override;
+ virtual bool HasFocus() const override;
void MovePluginContainer(const WebPluginGeometry&);
virtual void MovePluginWindows(
- const std::vector<WebPluginGeometry>&) OVERRIDE;
- virtual void Blur() OVERRIDE;
- virtual void UpdateCursor(const WebCursor&) OVERRIDE;
- virtual void SetIsLoading(bool) OVERRIDE;
+ const std::vector<WebPluginGeometry>&) override;
+ virtual void Blur() override;
+ virtual void UpdateCursor(const WebCursor&) override;
+ virtual void SetIsLoading(bool) override;
virtual void TextInputStateChanged(
- const ViewHostMsg_TextInputState_Params& params) OVERRIDE;
+ const ViewHostMsg_TextInputState_Params& params) override;
- virtual void ImeCancelComposition() OVERRIDE;
- virtual void ImeCompositionRangeChanged(const gfx::Range&, const std::vector<gfx::Rect>&) OVERRIDE;
- virtual void FocusedNodeChanged(bool is_editable_node) OVERRIDE;
+ virtual void ImeCancelComposition() override;
+ virtual void ImeCompositionRangeChanged(const gfx::Range&, const std::vector<gfx::Rect>&) override;
+ virtual void FocusedNodeChanged(bool is_editable_node) override;
- virtual void Destroy() OVERRIDE;
- virtual void SetTooltipText(const base::string16&) OVERRIDE;
- virtual void SelectionChanged(const base::string16&, size_t, const gfx::Range&) OVERRIDE;
- virtual void SelectionBoundsChanged(const ViewHostMsg_SelectionBounds_Params&) OVERRIDE;
+ virtual void Destroy() override;
+ virtual void SetTooltipText(const base::string16&) override;
+ virtual void SelectionChanged(const base::string16&, size_t, const gfx::Range&) override;
+ virtual void SelectionBoundsChanged(const ViewHostMsg_SelectionBounds_Params&) override;
virtual void CopyFromCompositingSurface(
const gfx::Rect&,
const gfx::Size& /* dst_size */,
const base::Callback<void(bool, const SkBitmap&)>&,
- const SkColorType) OVERRIDE;
+ const SkColorType) override;
virtual void CopyFromCompositingSurfaceToVideoFrame(
const gfx::Rect&,
const scoped_refptr<media::VideoFrame>&,
- const base::Callback<void(bool)>&) OVERRIDE;
+ const base::Callback<void(bool)>&) override;
- virtual bool CanCopyToVideoFrame() const OVERRIDE;
- virtual bool CanSubscribeFrame() const OVERRIDE;
+ virtual bool CanCopyToVideoFrame() const override;
+ virtual bool CanSubscribeFrame() const override;
virtual void BeginFrameSubscription(
- scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) OVERRIDE;
- virtual void EndFrameSubscription() OVERRIDE;
+ scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) override;
+ virtual void EndFrameSubscription() override;
#ifdef TIZEN_EDGE_EFFECT
- virtual void DidOverscroll(const DidOverscrollParams& params) OVERRIDE;
+ virtual void DidOverscroll(const DidOverscrollParams& params) override;
#endif
#ifdef TIZEN_CONTENTS_DETECTION
- virtual void OnContentsDetected(const char*) OVERRIDE;
+ virtual void OnContentsDetected(const char*) override;
#endif
- virtual void AcceleratedSurfaceInitialized(int, int) OVERRIDE;
+ virtual void AcceleratedSurfaceInitialized(int, int) override;
virtual void AcceleratedSurfaceBuffersSwapped(
const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params&,
- int) OVERRIDE;
+ int) override;
virtual void AcceleratedSurfacePostSubBuffer(
const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params&,
- int) OVERRIDE;
-
- virtual void AcceleratedSurfaceSuspend() OVERRIDE;
- virtual void AcceleratedSurfaceRelease() OVERRIDE;
- virtual bool HasAcceleratedSurface(const gfx::Size&) OVERRIDE;
- virtual void GetScreenInfo(blink::WebScreenInfo*) OVERRIDE;
- virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE;
- virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
+ int) override;
+
+ virtual void AcceleratedSurfaceSuspend() override;
+ virtual void AcceleratedSurfaceRelease() override;
+ virtual bool HasAcceleratedSurface(const gfx::Size&) override;
+ virtual void GetScreenInfo(blink::WebScreenInfo*) override;
+ virtual gfx::Rect GetBoundsInRootWindow() override;
+ virtual gfx::GLSurfaceHandle GetCompositingSurface() override;
virtual void ResizeCompositingSurface(const gfx::Size&);
- virtual void RenderProcessGone(base::TerminationStatus, int) OVERRIDE;
- virtual bool OnMessageReceived(const IPC::Message&) OVERRIDE;
+ virtual void RenderProcessGone(base::TerminationStatus, int) override;
+ virtual bool OnMessageReceived(const IPC::Message&) override;
void OnFilteredMessageReceived(const IPC::Message&);
- virtual void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo&, InputEventAckState) OVERRIDE;
- virtual void DidStopFlinging() OVERRIDE;
+ virtual void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo&, InputEventAckState) override;
+ virtual void DidStopFlinging() override;
#if defined(TOOLKIT_VIEWS) || defined(USE_AURA)
virtual void ShowDisambiguationPopup(const gfx::Rect& rect_pixels,
- const SkBitmap& zoomed_bitmap) OVERRIDE;
+ const SkBitmap& zoomed_bitmap) override;
#endif
// ui::GestureEventHelper implementation.
- virtual bool CanDispatchToConsumer(ui::GestureConsumer* consumer) OVERRIDE;
- virtual void DispatchCancelTouchEvent(ui::TouchEvent* event) OVERRIDE;
- virtual void DispatchGestureEvent(ui::GestureEvent*) OVERRIDE;
+ virtual bool CanDispatchToConsumer(ui::GestureConsumer* consumer) override;
+ virtual void DispatchCancelTouchEvent(ui::TouchEvent* event) override;
+ virtual void DispatchGestureEvent(ui::GestureEvent*) override;
// IPC::Sender implementation:
- virtual bool Send(IPC::Message*) OVERRIDE;
+ virtual bool Send(IPC::Message*) override;
void OnSelectionTextStyleState(const SelectionStylePrams& params);
void OnDidChangeMaxScrollOffset(int maxScrollX, int maxScrollY);
// content::NotificationObserver implementation:
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details) OVERRIDE;
+ const content::NotificationDetails& details) override;
void ClearCache();
void SetCacheModel(tizen_webview::Cache_Model model);
tizen_webview::Cache_Model GetCacheModel() const { return cache_model_; }
ResourceContext* resource_context,
AppCacheService* appcache_service,
ResourceType resource_type,
- ScopedVector<ResourceThrottle>* throttles) OVERRIDE;
+ ScopedVector<ResourceThrottle>* throttles) override;
// Create login delegate.
virtual ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(
- net::AuthChallengeInfo* auth_info, net::URLRequest* request) OVERRIDE;
+ net::AuthChallengeInfo* auth_info, net::URLRequest* request) override;
// Called to trigger download.
virtual void DownloadStarting(
int request_id,
bool is_content_initiated,
bool must_download,
- ScopedVector<content::ResourceThrottle>* throttles) OVERRIDE;
+ ScopedVector<content::ResourceThrottle>* throttles) override;
#if !defined(EWK_BRINGUP)
// Return true if it should override mime type, otherwise, return false.
virtual bool ShouldOverrideMimeType(
- const GURL& url, std::string& mime_type) OVERRIDE;
+ const GURL& url, std::string& mime_type) override;
#endif
private:
// BrowserMessageFilter implementation.
virtual void OverrideThreadForMessage(
const IPC::Message& message,
- content::BrowserThread::ID* thread) OVERRIDE;
- virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+ content::BrowserThread::ID* thread) override;
+ virtual bool OnMessageReceived(const IPC::Message& message) override;
private:
virtual ~VibrationMessageFilter() {}
// content::WebContentsView implementation.
virtual void CreateView(
- const gfx::Size& initial_size, gfx::NativeView context) OVERRIDE;
+ const gfx::Size& initial_size, gfx::NativeView context) override;
virtual RenderWidgetHostViewBase* CreateViewForWidget(
- RenderWidgetHost* render_widget_host) OVERRIDE;
+ RenderWidgetHost* render_widget_host) override;
virtual RenderWidgetHostViewBase* CreateViewForPopupWidget(
- RenderWidgetHost* render_widget_host) OVERRIDE;
- virtual void SetPageTitle(const base::string16& title) OVERRIDE;
- virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE;
- virtual void RenderViewSwappedIn(RenderViewHost* host) OVERRIDE;
- virtual void SetOverscrollControllerEnabled(bool enabled) OVERRIDE;
- virtual gfx::NativeView GetNativeView() const OVERRIDE;
- virtual gfx::NativeView GetContentNativeView() const OVERRIDE;
- virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE;
- virtual void GetContainerBounds(gfx::Rect* out) const OVERRIDE;
- virtual void SizeContents(const gfx::Size& size) OVERRIDE;
- virtual void Focus() OVERRIDE;
- virtual void SetInitialFocus() OVERRIDE;
- virtual void StoreFocus() OVERRIDE;
- virtual void RestoreFocus() OVERRIDE;
- virtual DropData* GetDropData() const OVERRIDE;
- virtual gfx::Rect GetViewBounds() const OVERRIDE;
+ RenderWidgetHost* render_widget_host) override;
+ virtual void SetPageTitle(const base::string16& title) override;
+ virtual void RenderViewCreated(RenderViewHost* host) override;
+ virtual void RenderViewSwappedIn(RenderViewHost* host) override;
+ virtual void SetOverscrollControllerEnabled(bool enabled) override;
+ virtual gfx::NativeView GetNativeView() const override;
+ virtual gfx::NativeView GetContentNativeView() const override;
+ virtual gfx::NativeWindow GetTopLevelNativeWindow() const override;
+ virtual void GetContainerBounds(gfx::Rect* out) const override;
+ virtual void SizeContents(const gfx::Size& size) override;
+ virtual void Focus() override;
+ virtual void SetInitialFocus() override;
+ virtual void StoreFocus() override;
+ virtual void RestoreFocus() override;
+ virtual DropData* GetDropData() const override;
+ virtual gfx::Rect GetViewBounds() const override;
// content::RenderViewHostDelegateView implementation.
- virtual void ShowContextMenu(RenderFrameHost* render_frame_host, const ContextMenuParams& params) OVERRIDE;
+ virtual void ShowContextMenu(RenderFrameHost* render_frame_host, const ContextMenuParams& params) override;
void UpdateDragDest(RenderViewHost* host);
virtual ~WebDataServiceWrapper();
- virtual void Shutdown() OVERRIDE;
+ virtual void Shutdown() override;
virtual scoped_refptr<autofill::AutofillWebDataService> GetAutofillWebData();
BrowserContextEfl(EWebContext*);
~BrowserContextEfl();
- virtual bool IsOffTheRecord() const OVERRIDE { return false; }
- virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
+ virtual bool IsOffTheRecord() const override { return false; }
+ virtual net::URLRequestContextGetter* GetRequestContext() override;
URLRequestContextGetterEfl* GetRequestContextEfl()
{ return request_context_getter_.get(); }
- virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess(int) OVERRIDE
+ virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess(int) override
{ return GetRequestContext(); }
- virtual net::URLRequestContextGetter* GetMediaRequestContext() OVERRIDE
+ virtual net::URLRequestContextGetter* GetMediaRequestContext() override
{ return GetRequestContext(); }
- virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(int) OVERRIDE
+ virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(int) override
{ return GetRequestContext(); }
virtual net::URLRequestContextGetter* GetMediaRequestContextForStoragePartition(
- const base::FilePath&, bool) OVERRIDE
+ const base::FilePath&, bool) override
{ return GetRequestContext(); }
// These methods map to Add methods in visitedlink::VisitedLinkMaster.
void AddVisitedURLs(const std::vector<GURL>& urls);
// visitedlink::VisitedLinkDelegate implementation.
virtual void RebuildTable(
- const scoped_refptr<URLEnumerator>& enumerator) OVERRIDE;
+ const scoped_refptr<URLEnumerator>& enumerator) override;
// Reset visitedlink master and initialize it.
void InitVisitedLinkMaster();
- virtual ResourceContext* GetResourceContext() OVERRIDE;
+ virtual ResourceContext* GetResourceContext() override;
- virtual content::DownloadManagerDelegate* GetDownloadManagerDelegate() OVERRIDE
+ virtual content::DownloadManagerDelegate* GetDownloadManagerDelegate() override
{ return &download_manager_delegate_; }
- virtual BrowserPluginGuestManager* GetGuestManager() OVERRIDE
+ virtual BrowserPluginGuestManager* GetGuestManager() override
{ return 0; }
- virtual storage::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE
+ virtual storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override
{ return 0; }
- virtual PushMessagingService* GetPushMessagingService() OVERRIDE
+ virtual PushMessagingService* GetPushMessagingService() override
{ return 0; }
- virtual base::FilePath GetPath() const OVERRIDE;
+ virtual base::FilePath GetPath() const override;
net::URLRequestContextGetter* CreateRequestContext(
content::ProtocolHandlerMap* protocol_handlers,
ResourceContextEfl(BrowserContextEfl*);
virtual ~ResourceContextEfl();
- virtual net::HostResolver* GetHostResolver() OVERRIDE;
- virtual net::URLRequestContext* GetRequestContext() OVERRIDE;
+ virtual net::HostResolver* GetHostResolver() override;
+ virtual net::URLRequestContext* GetRequestContext() override;
void set_url_request_context_getter(URLRequestContextGetterEfl* getter);
BrowserContextEfl* getBrowserContext() { return browser_context_; };
private:
static void ReadCertificateAndAdd(base::FilePath* file_path);
- virtual SSLHostStateDelegate* GetSSLHostStateDelegate() OVERRIDE;
+ virtual SSLHostStateDelegate* GetSSLHostStateDelegate() override;
scoped_ptr<visitedlink::VisitedLinkMaster> visitedlink_master_;
ResourceContextEfl* resource_context_;
virtual ~BrowserMainPartsEfl();
// BrowserMainParts overrides.
- virtual void PreMainMessageLoopRun() OVERRIDE;
- virtual void PostMainMessageLoopRun() OVERRIDE;
+ virtual void PreMainMessageLoopRun() override;
+ virtual void PostMainMessageLoopRun() override;
private:
DevToolsDelegateEfl* devtools_delegate_;
class ContentClientEfl : public content::ContentClient {
public:
// ContentClient implementation.
- virtual std::string GetProduct() const OVERRIDE;
- virtual std::string GetUserAgent() const OVERRIDE;
- virtual base::string16 GetLocalizedString(int message_id) const OVERRIDE;
+ virtual std::string GetProduct() const override;
+ virtual std::string GetUserAgent() const override;
+ virtual base::string16 GetLocalizedString(int message_id) const override;
virtual base::StringPiece GetDataResource(
int resource_id,
- ui::ScaleFactor scale_factor) const OVERRIDE;
- virtual bool CanSendWhileSwappedOut(const IPC::Message* message) OVERRIDE;
+ ui::ScaleFactor scale_factor) const override;
+ virtual bool CanSendWhileSwappedOut(const IPC::Message* message) override;
};
#endif // CONTENT_CLIENT_EFL_H_
public:
EditorClientObserver(int render_process_id);
- virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message& message) override;
virtual void OverrideThreadForMessage(const IPC::Message& message,
- content::BrowserThread::ID* thread) OVERRIDE;
+ content::BrowserThread::ID* thread) override;
private:
void OnUndoNotify(int render_view_id, size_t undoStackSize);
void OnRedoNotify(int render_view_id, size_t redoStackSize);
EditorClientAgent(content::RenderView* render_view);
// RenderView::Observer:
- virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message& message) override;
private:
// blink::WebEditorClient:
ContentBrowserClientEfl();
virtual BrowserMainParts* CreateBrowserMainParts(
- const MainFunctionParams& parameters) OVERRIDE;
+ const MainFunctionParams& parameters) override;
virtual net::URLRequestContextGetter* CreateRequestContext(
BrowserContext* browser_context,
ProtocolHandlerMap* protocol_handlers,
- URLRequestInterceptorScopedVector request_interceptors) OVERRIDE;
+ URLRequestInterceptorScopedVector request_interceptors) override;
- virtual AccessTokenStore* CreateAccessTokenStore() OVERRIDE;
+ virtual AccessTokenStore* CreateAccessTokenStore() override;
#if defined(OS_TIZEN)
- virtual LocationProvider* OverrideSystemLocationProvider() OVERRIDE;
+ virtual LocationProvider* OverrideSystemLocationProvider() override;
#endif
// Allows the embedder to pass extra command line flags.
// switches::kProcessType will already be set at this point.
virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
- int child_process_id) OVERRIDE;
+ int child_process_id) override;
- virtual void ResourceDispatcherHostCreated() OVERRIDE;
+ virtual void ResourceDispatcherHostCreated() override;
virtual void AllowCertificateError(int render_process_id,
int render_frame_id,
bool strict_enforcement,
bool expired_previous_decision,
const base::Callback<void(bool)>& callback,
- CertificateRequestResultType* result) OVERRIDE;
+ CertificateRequestResultType* result) override;
// Asks permission to show desktop notifications.
virtual void RequestDesktopNotificationPermission(const GURL& source_origin,
content::RenderFrameHost* render_frame_host,
- const base::Callback<void(blink::WebNotificationPermission)>& callback) OVERRIDE;
+ const base::Callback<void(blink::WebNotificationPermission)>& callback) override;
// Show a desktop notification. If |worker| is true, the request came from an
// HTML5 web worker, otherwise, it came from a renderer.
const content::ShowDesktopNotificationHostMsgParams& params,
content::RenderFrameHost* render_frame_host,
scoped_ptr<DesktopNotificationDelegate> delegate,
- base::Closure* cancel_callback) OVERRIDE;
+ base::Closure* cancel_callback) override;
virtual bool AllowGetCookie(const GURL& url,
const GURL& first_party,
const net::CookieList& cookie_list,
content::ResourceContext* context,
int render_process_id,
- int render_frame_id) OVERRIDE;
+ int render_frame_id) override;
virtual bool AllowSetCookie(const GURL& url,
const GURL& first_party,
content::ResourceContext* context,
int render_process_id,
int render_frame_id,
- net::CookieOptions* options) OVERRIDE;
+ net::CookieOptions* options) override;
- virtual void RenderProcessWillLaunch(content::RenderProcessHost* host) OVERRIDE;
+ virtual void RenderProcessWillLaunch(content::RenderProcessHost* host) override;
- content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() OVERRIDE;
+ content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;
private:
scoped_ptr<ResourceDispatcherHostDelegateEfl> resource_disp_host_del_efl_;
// if the process should exit afterwards, and if so, |exit_code| should be
// set. This is the place for embedder to do the things that must happen at
// the start. Most of its startup code should be in the methods below.
- virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
- virtual void PreSandboxStartup() OVERRIDE;
- virtual ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;
+ virtual bool BasicStartupComplete(int* exit_code) override;
+ virtual void PreSandboxStartup() override;
+ virtual ContentBrowserClient* CreateContentBrowserClient() override;
private:
scoped_ptr<ContentBrowserClient> client_;
std::string link_url,
std::string icon_path);
void HideSelectionHandle();
- virtual void OnDownloadUpdated(content::DownloadItem* download) OVERRIDE;
+ virtual void OnDownloadUpdated(content::DownloadItem* download) override;
void OnDownloadStarted(content::DownloadItem* item, content::DownloadInterruptReason interrupt_reason);
base::FilePath DownloadFile(const GURL url,
const base::FilePath outputDir,
private:
// content::DevToolsHttpHandler::ServerSocketFactory.
- virtual scoped_ptr<net::ServerSocket> Create() const OVERRIDE {
+ virtual scoped_ptr<net::ServerSocket> Create() const override {
return scoped_ptr<net::ServerSocket>(
new net::TCPServerSocket(NULL, net::NetLog::Source()));
}
void Stop();
// ChromiumDevToolsHttpHandler::Delegate overrides.
- virtual std::string GetDiscoveryPageHTML() OVERRIDE;
- virtual bool BundlesFrontendResources() OVERRIDE;
- virtual base::FilePath GetDebugFrontendDir() OVERRIDE;
+ virtual std::string GetDiscoveryPageHTML() override;
+ virtual bool BundlesFrontendResources() override;
+ virtual base::FilePath GetDebugFrontendDir() override;
virtual scoped_ptr<net::StreamListenSocket> CreateSocketForTethering(
net::StreamListenSocket::Delegate* delegate,
- std::string* name) OVERRIDE;
+ std::string* name) override;
DevToolsHttpHandler* devtools_http_handler() {
return devtools_http_handler_;
}
explicit Target(scoped_refptr<DevToolsAgentHost> agent_host);
- virtual std::string GetId() const OVERRIDE { return agent_host_->GetId(); }
- virtual std::string GetParentId() const OVERRIDE { return std::string(); }
- virtual std::string GetType() const OVERRIDE {
+ virtual std::string GetId() const override { return agent_host_->GetId(); }
+ virtual std::string GetParentId() const override { return std::string(); }
+ virtual std::string GetType() const override {
switch (agent_host_->GetType()) {
case DevToolsAgentHost::TYPE_WEB_CONTENTS:
return kTargetTypePage;
}
return kTargetTypeOther;
}
- virtual std::string GetTitle() const OVERRIDE {
+ virtual std::string GetTitle() const override {
return agent_host_->GetTitle();
}
- virtual std::string GetDescription() const OVERRIDE { return std::string(); }
- virtual GURL GetURL() const OVERRIDE { return agent_host_->GetURL(); }
- virtual GURL GetFaviconURL() const OVERRIDE { return favicon_url_; }
- virtual base::TimeTicks GetLastActivityTime() const OVERRIDE {
+ virtual std::string GetDescription() const override { return std::string(); }
+ virtual GURL GetURL() const override { return agent_host_->GetURL(); }
+ virtual GURL GetFaviconURL() const override { return favicon_url_; }
+ virtual base::TimeTicks GetLastActivityTime() const override {
return last_activity_time_;
}
- virtual bool IsAttached() const OVERRIDE {
+ virtual bool IsAttached() const override {
return agent_host_->IsAttached();
}
- virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const OVERRIDE {
+ virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const override {
return agent_host_;
}
- virtual bool Activate() const OVERRIDE;
- virtual bool Close() const OVERRIDE;
+ virtual bool Activate() const override;
+ virtual bool Close() const override;
private:
// content::DevToolsManagerDelegate implementation.
virtual void Inspect(content::BrowserContext* browser_context,
- content::DevToolsAgentHost* agent_host) OVERRIDE {};
+ content::DevToolsAgentHost* agent_host) override {};
virtual void DevToolsAgentStateChanged(content::DevToolsAgentHost* agent_host,
- bool attached) OVERRIDE {};
+ bool attached) override {};
virtual base::DictionaryValue* HandleCommand(
content::DevToolsAgentHost* agent_host,
- base::DictionaryValue* command_dict) OVERRIDE;
+ base::DictionaryValue* command_dict) override;
virtual scoped_ptr<content::DevToolsTarget> CreateNewTarget(
- const GURL& url) OVERRIDE;
- virtual void EnumerateTargets(TargetCallback callback) OVERRIDE;
- virtual std::string GetPageThumbnailData(const GURL& url) OVERRIDE;
+ const GURL& url) override;
+ virtual void EnumerateTargets(TargetCallback callback) override;
+ virtual std::string GetPageThumbnailData(const GURL& url) override;
private:
DISALLOW_COPY_AND_ASSIGN(DevToolsManagerDelegateEfl);
web_contents->GetRenderProcessHost()->AddFilter(this);
}
- virtual void OverrideThreadForMessage(const IPC::Message& message, BrowserThread::ID* thread) OVERRIDE
+ virtual void OverrideThreadForMessage(const IPC::Message& message, BrowserThread::ID* thread) override
{
if (message.type() == EwkViewHostMsg_HitTestAsyncReply::ID)
*thread = BrowserThread::UI;
}
- virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE
+ virtual bool OnMessageReceived(const IPC::Message& message) override
{
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(WebViewBrowserMessageFilter, message)
struct GLSharedContextEflPrivate : public gfx::GLContext {
virtual bool Initialize(
- gfx::GLSurface*, gfx::GpuPreference) OVERRIDE {
+ gfx::GLSurface*, gfx::GpuPreference) override {
NOTREACHED();
}
- virtual void Destroy() OVERRIDE {
+ virtual void Destroy() override {
NOTREACHED();
}
- virtual bool MakeCurrent(gfx::GLSurface*) OVERRIDE {
+ virtual bool MakeCurrent(gfx::GLSurface*) override {
NOTREACHED();
return false;
}
- virtual void ReleaseCurrent(gfx::GLSurface*) OVERRIDE {
+ virtual void ReleaseCurrent(gfx::GLSurface*) override {
NOTREACHED();
}
- virtual bool IsCurrent(gfx::GLSurface*) OVERRIDE {
+ virtual bool IsCurrent(gfx::GLSurface*) override {
NOTREACHED();
return false;
}
- virtual void* GetHandle() OVERRIDE {
+ virtual void* GetHandle() override {
return handle_;
}
- virtual void SetSwapInterval(int) OVERRIDE {
+ virtual void SetSwapInterval(int) override {
NOTREACHED();
}
explicit GpuChildThreadEfl(const std::string& channel_id)
: GpuChildThread(channel_id) { }
- virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE {
+ virtual bool OnControlMessageReceived(const IPC::Message& msg) override {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(GpuChildThreadEfl, msg)
IPC_MESSAGE_HANDLER(GpuMsg_Initialize, OnInitialize)
explicit InProcessGpuThreadEfl(const std::string& channel_id)
: InProcessGpuThread(channel_id) { }
- virtual void Init() OVERRIDE {
+ virtual void Init() override {
gpu_process_ = new content::GpuProcess();
// The process object takes ownership of the thread object, so do not
// save and delete the pointer.
MessagePumpForUIEfl();
virtual ~MessagePumpForUIEfl();
- virtual void Run(Delegate *) OVERRIDE;
- virtual void Quit() OVERRIDE;
- virtual void ScheduleWork() OVERRIDE;
- virtual void ScheduleDelayedWork(const base::TimeTicks&) OVERRIDE;
+ virtual void Run(Delegate *) override;
+ virtual void Quit() override;
+ virtual void ScheduleWork() override;
+ virtual void ScheduleDelayedWork(const base::TimeTicks&) override;
private:
static void PipeCallback(void*, void*, unsigned int);
// NetworkDelegate implementation.
virtual int OnBeforeURLRequest(URLRequest* request,
const CompletionCallback& callback,
- GURL* new_url) OVERRIDE;
+ GURL* new_url) override;
virtual int OnBeforeSendHeaders(URLRequest* request,
const CompletionCallback& callback,
- HttpRequestHeaders* headers) OVERRIDE;
+ HttpRequestHeaders* headers) override;
virtual void OnSendHeaders(URLRequest* request,
- const HttpRequestHeaders& headers) OVERRIDE;
+ const HttpRequestHeaders& headers) override;
virtual int OnHeadersReceived(
URLRequest* request,
const CompletionCallback& callback,
const HttpResponseHeaders* original_response_headers,
scoped_refptr<HttpResponseHeaders>* override_response_headers,
- GURL* allowed_unsafe_redirect_url) OVERRIDE;
+ GURL* allowed_unsafe_redirect_url) override;
virtual void OnBeforeRedirect(URLRequest* request,
- const GURL& new_location) OVERRIDE;
- virtual void OnResponseStarted(URLRequest* request) OVERRIDE;
- virtual void OnRawBytesRead(const URLRequest& request, int bytes_read) OVERRIDE;
- virtual void OnCompleted(URLRequest* request, bool started) OVERRIDE;
- virtual void OnURLRequestDestroyed(URLRequest* request) OVERRIDE;
+ const GURL& new_location) override;
+ virtual void OnResponseStarted(URLRequest* request) override;
+ virtual void OnRawBytesRead(const URLRequest& request, int bytes_read) override;
+ virtual void OnCompleted(URLRequest* request, bool started) override;
+ virtual void OnURLRequestDestroyed(URLRequest* request) override;
virtual void OnPACScriptError(int line_number,
- const base::string16& error) OVERRIDE;
+ const base::string16& error) override;
virtual AuthRequiredResponse OnAuthRequired(
URLRequest* request,
const AuthChallengeInfo& auth_info,
const AuthCallback& callback,
- AuthCredentials* credentials) OVERRIDE;
+ AuthCredentials* credentials) override;
virtual bool OnCanGetCookies(const URLRequest& request,
- const CookieList& cookie_list) OVERRIDE;
+ const CookieList& cookie_list) override;
virtual bool OnCanSetCookie(const URLRequest& request,
const std::string& cookie_line,
- CookieOptions* options) OVERRIDE;
+ CookieOptions* options) override;
virtual bool OnCanAccessFile(const URLRequest& request,
- const base::FilePath& path) const OVERRIDE;
- virtual bool OnCanThrottleRequest(const URLRequest& request) const OVERRIDE;
+ const base::FilePath& path) const override;
+ virtual bool OnCanThrottleRequest(const URLRequest& request) const override;
virtual int OnBeforeSocketStreamConnect(
SocketStream* stream,
- const CompletionCallback& callback) OVERRIDE;
+ const CompletionCallback& callback) override;
typedef base::hash_map<uint64, scoped_refptr<PolicyResponseDelegateEfl> > ResponsePolicyDelegateTable;
ResponsePolicyDelegateTable policy_response_delegate_map_;
const blink::WebURLRequest& request,
blink::WebNavigationType type,
blink::WebNavigationPolicy default_policy,
- bool is_redirect) OVERRIDE;
+ bool is_redirect) override;
#endif
virtual bool WillSendRequest(blink::WebFrame* frame,
GURL* new_url);
unsigned long long VisitedLinkHash(const char* canonical_url,
- size_t length) OVERRIDE;
+ size_t length) override;
- bool IsLinkVisited(unsigned long long link_hash) OVERRIDE;
+ bool IsLinkVisited(unsigned long long link_hash) override;
private:
scoped_ptr<WrtWidget> wrt_widget_;
explicit RenderProcessObserverEfl(ContentRendererClientEfl* content_client)
: content_client_(content_client), webkit_initialized_(false) { }
- virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
- virtual void WebKitInitialized() OVERRIDE;
+ virtual bool OnControlMessageReceived(const IPC::Message& message) override;
+ virtual void WebKitInitialized() override;
void OnClearCache();
void OnPurgeMemory();
explicit RenderViewObserverEfl(content::RenderView* render_view);
virtual ~RenderViewObserverEfl();
- void DidChangeScrollOffset(blink::WebLocalFrame* frame) OVERRIDE;
- bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
- virtual void DidCreateDocumentElement(blink::WebLocalFrame* frame) OVERRIDE;
- virtual void OrientationChangeEvent() OVERRIDE;
+ void DidChangeScrollOffset(blink::WebLocalFrame* frame) override;
+ bool OnMessageReceived(const IPC::Message& message) override;
+ virtual void DidCreateDocumentElement(blink::WebLocalFrame* frame) override;
+ virtual void OrientationChangeEvent() override;
#if !defined(EWK_BRINGUP)
- virtual void DidChangePageScaleFactor() OVERRIDE;
+ virtual void DidChangePageScaleFactor() override;
#endif
//Changes in PageScaleFactorLimits are applied when layoutUpdated is called
//So using this notification to update minimum and maximum page scale factor values
- virtual void DidUpdateLayout() OVERRIDE;
+ virtual void DidUpdateLayout() override;
private:
void OnSetContentSecurityPolicy(const std::string& policy, tizen_webview::ContentSecurityPolicyType header_type);
virtual ~EflScreen() {
}
- virtual bool IsDIPEnabled() OVERRIDE {
+ virtual bool IsDIPEnabled() override {
return true;
}
- virtual gfx::Point GetCursorScreenPoint() OVERRIDE {
+ virtual gfx::Point GetCursorScreenPoint() override {
XDisplay* display = gfx::GetXDisplay();
::Window root, child;
return gfx::Point(root_x, root_y);
}
- virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE {
+ virtual gfx::NativeWindow GetWindowUnderCursor() override {
return GetWindowAtScreenPoint(GetCursorScreenPoint());
}
- virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) OVERRIDE {
+ virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override {
return NULL;
}
- virtual int GetNumDisplays() const OVERRIDE {
+ virtual int GetNumDisplays() const override {
return 1;
}
- virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE {
+ virtual std::vector<gfx::Display> GetAllDisplays() const override {
return std::vector<gfx::Display>(1, GetPrimaryDisplay());
}
- virtual gfx::Display GetDisplayNearestWindow(gfx::NativeView view) const OVERRIDE {
+ virtual gfx::Display GetDisplayNearestWindow(gfx::NativeView view) const override {
return GetPrimaryDisplay();
}
virtual gfx::Display GetDisplayNearestPoint(
- const gfx::Point& point) const OVERRIDE {
+ const gfx::Point& point) const override {
return GetPrimaryDisplay();
}
virtual gfx::Display GetDisplayMatching(
- const gfx::Rect& match_rect) const OVERRIDE {
+ const gfx::Rect& match_rect) const override {
return GetPrimaryDisplay();
}
- virtual gfx::Display GetPrimaryDisplay() const OVERRIDE {
+ virtual gfx::Display GetPrimaryDisplay() const override {
static ::Screen* screen = DefaultScreenOfDisplay(gfx::GetXDisplay());
static gfx::Display display(0,
return display;
}
- virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE {
+ virtual void AddObserver(gfx::DisplayObserver* observer) override {
}
- virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE {
+ virtual void RemoveObserver(gfx::DisplayObserver* observer) override {
}
private:
void ClearSelection();
void ClearSelectionViaEWebView();
EWebView* GetParentView() { return parent_view_; }
- void HideHandle() OVERRIDE;
+ void HideHandle() override;
void HideHandleAndContextMenu();
bool IsAnyHandleVisible() const;
net::NetLog* net_log);
// net::URLRequestContextGetter implementation.
- virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
+ virtual net::URLRequestContext* GetURLRequestContext() override;
virtual scoped_refptr<base::SingleThreadTaskRunner>
- GetNetworkTaskRunner() const OVERRIDE;
+ GetNetworkTaskRunner() const override;
net::HostResolver* host_resolver();
~WebContentsDelegateEfl();
virtual WebContents* OpenURLFromTab(WebContents* source,
- const content::OpenURLParams& params) OVERRIDE;
+ const content::OpenURLParams& params) override;
virtual void NavigationStateChanged(const WebContents* source,
- InvalidateTypes changed_flags) OVERRIDE;
+ InvalidateTypes changed_flags) override;
- virtual void LoadProgressChanged(WebContents* source, double progress) OVERRIDE;
+ virtual void LoadProgressChanged(WebContents* source, double progress) override;
virtual void LoadingStateChanged(WebContents* source,
- bool to_different_document) OVERRIDE;
+ bool to_different_document) override;
virtual bool ShouldCreateWebContents(
WebContents*,
const base::string16& frame_name,
const GURL& target_url,
const std::string& partition_id,
- SessionStorageNamespace* session_storage_namespace) OVERRIDE;
+ SessionStorageNamespace* session_storage_namespace) override;
virtual void WebContentsCreated(
WebContents* source_contents,
int opener_render_frame_id,
const base::string16& frame_name,
const GURL& target_url,
- WebContents* new_contents) OVERRIDE;
+ WebContents* new_contents) override;
- virtual void CloseContents(WebContents* source) OVERRIDE;
+ virtual void CloseContents(WebContents* source) override;
virtual void ToggleFullscreenModeForTab(WebContents* web_contents,
- bool enter_fullscreen) OVERRIDE;
+ bool enter_fullscreen) override;
virtual bool IsFullscreenForTabOrPending(
- const WebContents* web_contents) const OVERRIDE;
+ const WebContents* web_contents) const override;
virtual void RequestMediaAccessPermission(
WebContents* web_contents,
const MediaStreamRequest& request,
- const MediaResponseCallback& callback) OVERRIDE;
+ const MediaResponseCallback& callback) override;
void RegisterProtocolHandler(WebContents* web_contents,
const std::string& protocol,
const GURL& url,
- bool user_gesture) OVERRIDE;
+ bool user_gesture) override;
void FindReply(WebContents* web_contents,
int request_id,
int number_of_matches,
const gfx::Rect& selection_rect,
int active_match_ordinal,
- bool final_update) OVERRIDE;
+ bool final_update) override;
void RequestCertificateConfirm(WebContents* web_contents, int cert_error,
const net::SSLInfo& ssl_info, const GURL& url, ResourceType resource_type,
virtual void DidStartProvisionalLoadForFrame(RenderFrameHost* render_frame_host,
const GURL& validated_url,
bool is_error_page,
- bool is_iframe_srcdoc) OVERRIDE;
+ bool is_iframe_srcdoc) override;
virtual void DidCommitProvisionalLoadForFrame(RenderFrameHost* render_frame_host,
const GURL& url,
- ui::PageTransition transition_type) OVERRIDE;
+ ui::PageTransition transition_type) override;
- virtual void DidNavigateAnyFrame(const LoadCommittedDetails& details, const FrameNavigateParams& params) OVERRIDE;
+ virtual void DidNavigateAnyFrame(const LoadCommittedDetails& details, const FrameNavigateParams& params) override;
void OnAuthRequired(net::URLRequest* request,
const std::string& realm,
LoginDelegateEfl* login_delegate);
virtual void DidFailProvisionalLoad(RenderFrameHost* render_frame_host,
const GURL& validated_url,
int error_code,
- const base::string16& error_description) OVERRIDE;
+ const base::string16& error_description) override;
virtual void DidFailLoad(RenderFrameHost* render_frame_host,
const GURL& validated_url,
int error_code,
- const base::string16& error_description) OVERRIDE;
+ const base::string16& error_description) override;
virtual void DidFinishLoad(RenderFrameHost* render_frame_host,
- const GURL& validated_url) OVERRIDE;
+ const GURL& validated_url) override;
- virtual void DidStartLoading(RenderViewHost* render_view_host) OVERRIDE;
- virtual void DidUpdateFaviconURL(const std::vector<FaviconURL>& candidates) OVERRIDE;
+ virtual void DidStartLoading(RenderViewHost* render_view_host) override;
+ virtual void DidUpdateFaviconURL(const std::vector<FaviconURL>& candidates) override;
virtual void DidDownloadFavicon(bool success, const GURL& icon_url, const SkBitmap& bitmap);
void OnFormSubmit(const GURL&);
void set_new_window_policy(bool policy) { should_open_new_window_ = policy; }
bool get_new_window_policy() const { return should_open_new_window_; }
- JavaScriptDialogManager* GetJavaScriptDialogManager() OVERRIDE;
+ JavaScriptDialogManager* GetJavaScriptDialogManager() override;
- void DidFirstVisuallyNonEmptyPaint() OVERRIDE;
+ void DidFirstVisuallyNonEmptyPaint() override;
- bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+ bool OnMessageReceived(const IPC::Message& message) override;
void OnPrintedMetafileReceived(const DidPrintPagesParams& params);
- virtual void NavigationEntryCommitted(const LoadCommittedDetails& load_details) OVERRIDE;
- virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
+ virtual void NavigationEntryCommitted(const LoadCommittedDetails& load_details) override;
+ virtual void RenderProcessGone(base::TerminationStatus status) override;
virtual bool AddMessageToConsole(WebContents* source,
int32 level,
const base::string16& message,
int32 line_no,
- const base::string16& source_id) OVERRIDE;
+ const base::string16& source_id) override;
void RunFileChooser(WebContents* web_contents, const FileChooserParams& params);
ColorChooser* OpenColorChooser(WebContents* web_contents, SkColor color, const std::vector<ColorSuggestion>& suggestions);
void OnAccessRequestResponse(Eina_Bool allowed);
class WebProcessContentMainDelegateEfl: public content::ContentMainDelegate {
public:
- virtual void PreSandboxStartup() OVERRIDE;
- virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
- virtual ContentRendererClient* CreateContentRendererClient() OVERRIDE;
+ virtual void PreSandboxStartup() override;
+ virtual bool BasicStartupComplete(int* exit_code) override;
+ virtual ContentRendererClient* CreateContentRendererClient() override;
};
} // namespace content