mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OVERRIDE => override

Browse source
This commit is contained in:
Cheng Zhao 2014-10-23 11:10:39 +08:00
parent e94795a600
commit f809fef22d
20 changed files with 153 additions and 153 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
brightray/browser/browser_client.h
View file

@ -36,20 +36,20 @@ class BrowserClient : public content::ContentBrowserClient {
virtual net::URLRequestContextGetter* CreateRequestContext( virtual net::URLRequestContextGetter* CreateRequestContext(
content::BrowserContext* browser_context, content::BrowserContext* browser_context,
content::ProtocolHandlerMap* protocol_handlers, content::ProtocolHandlerMap* protocol_handlers,
content::URLRequestInterceptorScopedVector protocol_interceptors) OVERRIDE; content::URLRequestInterceptorScopedVector protocol_interceptors) override;
private: private:
virtual content::BrowserMainParts* CreateBrowserMainParts( virtual content::BrowserMainParts* CreateBrowserMainParts(
const content::MainFunctionParams&) OVERRIDE; const content::MainFunctionParams&) override;
virtual void ShowDesktopNotification( virtual void ShowDesktopNotification(
const content::ShowDesktopNotificationHostMsgParams& params, const content::ShowDesktopNotificationHostMsgParams& params,
content::RenderFrameHost* render_frame_host, content::RenderFrameHost* render_frame_host,
scoped_ptr<content::DesktopNotificationDelegate> delegate, scoped_ptr<content::DesktopNotificationDelegate> delegate,
base::Closure* cancel_callback) override; base::Closure* cancel_callback) override;
virtual content::MediaObserver* GetMediaObserver() OVERRIDE; virtual content::MediaObserver* GetMediaObserver() override;
virtual void GetAdditionalAllowedSchemesForFileSystem( virtual void GetAdditionalAllowedSchemesForFileSystem(
std::vector<std::string>* additional_schemes) OVERRIDE; std::vector<std::string>* additional_schemes) override;
virtual base::FilePath GetDefaultDownloadDirectory() OVERRIDE; virtual base::FilePath GetDefaultDownloadDirectory() override;
BrowserMainParts* browser_main_parts_; BrowserMainParts* browser_main_parts_;
scoped_ptr<NotificationPresenter> notification_presenter_; scoped_ptr<NotificationPresenter> notification_presenter_;

8
brightray/browser/browser_context.cc
View file

@ -37,23 +37,23 @@ class BrowserContext::ResourceContext : public content::ResourceContext {
} }
private: private:
virtual net::HostResolver* GetHostResolver() OVERRIDE { virtual net::HostResolver* GetHostResolver() override {
return getter_->host_resolver(); return getter_->host_resolver();
} }
virtual net::URLRequestContext* GetRequestContext() OVERRIDE { virtual net::URLRequestContext* GetRequestContext() override {
return getter_->GetURLRequestContext(); return getter_->GetURLRequestContext();
} }
// FIXME: We should probably allow clients to override this to implement more // FIXME: We should probably allow clients to override this to implement more
// restrictive policies. // restrictive policies.
virtual bool AllowMicAccess(const GURL& origin) OVERRIDE { virtual bool AllowMicAccess(const GURL& origin) override {
return true; return true;
} }
// FIXME: We should probably allow clients to override this to implement more // FIXME: We should probably allow clients to override this to implement more
// restrictive policies. // restrictive policies.
virtual bool AllowCameraAccess(const GURL& origin) OVERRIDE { virtual bool AllowCameraAccess(const GURL& origin) override {
return true; return true;
} }

22
brightray/browser/browser_context.h
View file

@ -39,30 +39,30 @@ class BrowserContext : public content::BrowserContext,
virtual void RegisterPrefs(PrefRegistrySimple* pref_registry) {} virtual void RegisterPrefs(PrefRegistrySimple* pref_registry) {}
// URLRequestContextGetter::Delegate: // URLRequestContextGetter::Delegate:
virtual net::NetworkDelegate* CreateNetworkDelegate() OVERRIDE; virtual net::NetworkDelegate* CreateNetworkDelegate() override;
virtual base::FilePath GetPath() const OVERRIDE; virtual base::FilePath GetPath() const override;
private: private:
class ResourceContext; class ResourceContext;
void RegisterInternalPrefs(PrefRegistrySimple* pref_registry); void RegisterInternalPrefs(PrefRegistrySimple* pref_registry);
virtual bool IsOffTheRecord() const OVERRIDE; virtual bool IsOffTheRecord() const override;
virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE; virtual net::URLRequestContextGetter* GetRequestContext() override;
virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess( virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess(
int renderer_child_id); int renderer_child_id);
virtual net::URLRequestContextGetter* GetMediaRequestContext() OVERRIDE; virtual net::URLRequestContextGetter* GetMediaRequestContext() override;
virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess( virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(
int renderer_child_id) OVERRIDE; int renderer_child_id) override;
virtual net::URLRequestContextGetter* virtual net::URLRequestContextGetter*
GetMediaRequestContextForStoragePartition( GetMediaRequestContextForStoragePartition(
const base::FilePath& partition_path, bool in_memory); const base::FilePath& partition_path, bool in_memory);
virtual content::ResourceContext* GetResourceContext() OVERRIDE; virtual content::ResourceContext* GetResourceContext() override;
virtual content::DownloadManagerDelegate* GetDownloadManagerDelegate() OVERRIDE; virtual content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
virtual content::BrowserPluginGuestManager* GetGuestManager() OVERRIDE; virtual content::BrowserPluginGuestManager* GetGuestManager() override;
virtual quota::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE; virtual quota::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
virtual content::PushMessagingService* GetPushMessagingService() OVERRIDE; virtual content::PushMessagingService* GetPushMessagingService() override;
virtual content::SSLHostStateDelegate* GetSSLHostStateDelegate() override; virtual content::SSLHostStateDelegate* GetSSLHostStateDelegate() override;
base::FilePath path_; base::FilePath path_;

12
brightray/browser/browser_main_parts.h
View file

@ -36,12 +36,12 @@ class BrowserMainParts : public content::BrowserMainParts {
protected: protected:
// content::BrowserMainParts: // content::BrowserMainParts:
virtual void PreEarlyInitialization() OVERRIDE; virtual void PreEarlyInitialization() override;
virtual void ToolkitInitialized() OVERRIDE; virtual void ToolkitInitialized() override;
virtual void PreMainMessageLoopStart() OVERRIDE; virtual void PreMainMessageLoopStart() override;
virtual void PreMainMessageLoopRun() OVERRIDE; virtual void PreMainMessageLoopRun() override;
virtual void PostMainMessageLoopRun() OVERRIDE; virtual void PostMainMessageLoopRun() override;
virtual int PreCreateThreads() OVERRIDE; virtual int PreCreateThreads() override;
// Subclasses should override this to provide their own BrowserContxt // Subclasses should override this to provide their own BrowserContxt
// implementation. The caller takes ownership of the returned object. // implementation. The caller takes ownership of the returned object.

4
brightray/browser/default_web_contents_delegate.h
View file

@ -16,10 +16,10 @@ class DefaultWebContentsDelegate : public content::WebContentsDelegate {
virtual void RequestMediaAccessPermission( virtual void RequestMediaAccessPermission(
content::WebContents*, content::WebContents*,
const content::MediaStreamRequest&, const content::MediaStreamRequest&,
const content::MediaResponseCallback&) OVERRIDE; const content::MediaResponseCallback&) override;
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
virtual void HandleKeyboardEvent( virtual void HandleKeyboardEvent(
content::WebContents*, const content::NativeWebKeyboardEvent&) OVERRIDE; content::WebContents*, const content::NativeWebKeyboardEvent&) override;
#endif #endif
}; };

22
brightray/browser/devtools_delegate.cc
View file

@ -67,24 +67,24 @@ class Target : public content::DevToolsTarget {
public: public:
explicit Target(WebContents* web_contents); explicit Target(WebContents* web_contents);
virtual std::string GetId() const OVERRIDE { return id_; } virtual std::string GetId() const override { return id_; }
virtual std::string GetParentId() const { return std::string(); } virtual std::string GetParentId() const { return std::string(); }
virtual std::string GetType() const OVERRIDE { return kTargetTypePage; } virtual std::string GetType() const override { return kTargetTypePage; }
virtual std::string GetTitle() const OVERRIDE { return title_; } virtual std::string GetTitle() const override { return title_; }
virtual std::string GetDescription() const OVERRIDE { return std::string(); } virtual std::string GetDescription() const override { return std::string(); }
virtual GURL GetURL() const OVERRIDE { return url_; } virtual GURL GetURL() const override { return url_; }
virtual GURL GetFaviconURL() const OVERRIDE { return favicon_url_; } virtual GURL GetFaviconURL() const override { return favicon_url_; }
virtual base::TimeTicks GetLastActivityTime() const OVERRIDE { virtual base::TimeTicks GetLastActivityTime() const override {
return last_activity_time_; return last_activity_time_;
} }
virtual bool IsAttached() const OVERRIDE { virtual bool IsAttached() const override {
return agent_host_->IsAttached(); return agent_host_->IsAttached();
} }
virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const OVERRIDE { virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const override {
return agent_host_; return agent_host_;
} }
virtual bool Activate() const OVERRIDE; virtual bool Activate() const override;
virtual bool Close() const OVERRIDE; virtual bool Close() const override;
private: private:
scoped_refptr<DevToolsAgentHost> agent_host_; scoped_refptr<DevToolsAgentHost> agent_host_;

14
brightray/browser/devtools_delegate.h
View file

@ -27,16 +27,16 @@ class DevToolsDelegate : public content::DevToolsHttpHandlerDelegate {
void Stop(); void Stop();
// DevToolsHttpProtocolHandler::Delegate overrides. // DevToolsHttpProtocolHandler::Delegate overrides.
virtual std::string GetDiscoveryPageHTML() OVERRIDE; virtual std::string GetDiscoveryPageHTML() override;
virtual bool BundlesFrontendResources() OVERRIDE; virtual bool BundlesFrontendResources() override;
virtual base::FilePath GetDebugFrontendDir() OVERRIDE; virtual base::FilePath GetDebugFrontendDir() override;
virtual std::string GetPageThumbnailData(const GURL& url) OVERRIDE; virtual std::string GetPageThumbnailData(const GURL& url) override;
virtual scoped_ptr<content::DevToolsTarget> CreateNewTarget( virtual scoped_ptr<content::DevToolsTarget> CreateNewTarget(
const GURL& url) OVERRIDE; const GURL& url) override;
virtual void EnumerateTargets(TargetCallback callback) OVERRIDE; virtual void EnumerateTargets(TargetCallback callback) override;
virtual scoped_ptr<net::StreamListenSocket> CreateSocketForTethering( virtual scoped_ptr<net::StreamListenSocket> CreateSocketForTethering(
net::StreamListenSocket::Delegate* delegate, net::StreamListenSocket::Delegate* delegate,
std::string* name) OVERRIDE; std::string* name) override;
content::DevToolsHttpHandler* devtools_http_handler() { content::DevToolsHttpHandler* devtools_http_handler() {
return devtools_http_handler_; return devtools_http_handler_;

8
brightray/browser/devtools_ui.cc
View file

@ -55,14 +55,14 @@ class BundledDataSource : public content::URLDataSource {
} }
// content::URLDataSource implementation. // content::URLDataSource implementation.
virtual std::string GetSource() const OVERRIDE { virtual std::string GetSource() const override {
return kChromeUIDevToolsBundledHost; return kChromeUIDevToolsBundledHost;
} }
virtual void StartDataRequest(const std::string& path, virtual void StartDataRequest(const std::string& path,
int render_process_id, int render_process_id,
int render_view_id, int render_view_id,
const GotDataCallback& callback) OVERRIDE { const GotDataCallback& callback) override {
std::string filename = PathWithoutParams(path); std::string filename = PathWithoutParams(path);
int resource_id = int resource_id =
@ -77,11 +77,11 @@ class BundledDataSource : public content::URLDataSource {
callback.Run(bytes); callback.Run(bytes);
} }
virtual std::string GetMimeType(const std::string& path) const OVERRIDE { virtual std::string GetMimeType(const std::string& path) const override {
return GetMimeTypeForPath(path); return GetMimeTypeForPath(path);
} }
virtual bool ShouldAddContentSecurityPolicy() const OVERRIDE { virtual bool ShouldAddContentSecurityPolicy() const override {
return false; return false;
} }

58
brightray/browser/inspectable_web_contents_impl.h
View file

@ -41,12 +41,12 @@ class InspectableWebContentsImpl :
explicit InspectableWebContentsImpl(content::WebContents*); explicit InspectableWebContentsImpl(content::WebContents*);
virtual ~InspectableWebContentsImpl(); virtual ~InspectableWebContentsImpl();
virtual InspectableWebContentsView* GetView() const OVERRIDE; virtual InspectableWebContentsView* GetView() const override;
virtual content::WebContents* GetWebContents() const OVERRIDE; virtual content::WebContents* GetWebContents() const override;
virtual void ShowDevTools() OVERRIDE; virtual void ShowDevTools() override;
virtual void CloseDevTools() OVERRIDE; virtual void CloseDevTools() override;
virtual bool IsDevToolsViewShowing() OVERRIDE; virtual bool IsDevToolsViewShowing() override;
// Return the last position and size of devtools window. // Return the last position and size of devtools window.
gfx::Rect GetDevToolsBounds() const; gfx::Rect GetDevToolsBounds() const;
@ -66,32 +66,32 @@ class InspectableWebContentsImpl :
private: private:
// DevToolsEmbedderMessageDispacher::Delegate // DevToolsEmbedderMessageDispacher::Delegate
virtual void ActivateWindow() OVERRIDE; virtual void ActivateWindow() override;
virtual void CloseWindow() OVERRIDE; virtual void CloseWindow() override;
virtual void SetInspectedPageBounds(const gfx::Rect& rect) OVERRIDE; virtual void SetInspectedPageBounds(const gfx::Rect& rect) override;
virtual void InspectElementCompleted() OVERRIDE; virtual void InspectElementCompleted() override;
virtual void MoveWindow(int x, int y) OVERRIDE; virtual void MoveWindow(int x, int y) override;
virtual void SetIsDocked(bool docked) OVERRIDE; virtual void SetIsDocked(bool docked) override;
virtual void OpenInNewTab(const std::string& url) OVERRIDE; virtual void OpenInNewTab(const std::string& url) override;
virtual void SaveToFile(const std::string& url, virtual void SaveToFile(const std::string& url,
const std::string& content, const std::string& content,
bool save_as) OVERRIDE; bool save_as) override;
virtual void AppendToFile(const std::string& url, virtual void AppendToFile(const std::string& url,
const std::string& content) OVERRIDE; const std::string& content) override;
virtual void RequestFileSystems() OVERRIDE; virtual void RequestFileSystems() override;
virtual void AddFileSystem() OVERRIDE; virtual void AddFileSystem() override;
virtual void RemoveFileSystem(const std::string& file_system_path) OVERRIDE; virtual void RemoveFileSystem(const std::string& file_system_path) override;
virtual void UpgradeDraggedFileSystemPermissions( virtual void UpgradeDraggedFileSystemPermissions(
const std::string& file_system_url) OVERRIDE; const std::string& file_system_url) override;
virtual void IndexPath(int request_id, virtual void IndexPath(int request_id,
const std::string& file_system_path) OVERRIDE; const std::string& file_system_path) override;
virtual void StopIndexing(int request_id) OVERRIDE; virtual void StopIndexing(int request_id) override;
virtual void SearchInPath(int request_id, virtual void SearchInPath(int request_id,
const std::string& file_system_path, const std::string& file_system_path,
const std::string& query) OVERRIDE; const std::string& query) override;
virtual void ZoomIn() OVERRIDE; virtual void ZoomIn() override;
virtual void ZoomOut() OVERRIDE; virtual void ZoomOut() override;
virtual void ResetZoom() OVERRIDE; virtual void ResetZoom() override;
// content::DevToolsClientHost: // content::DevToolsClientHost:
virtual void DispatchOnInspectorFrontend(const std::string& message) override; virtual void DispatchOnInspectorFrontend(const std::string& message) override;
@ -105,8 +105,8 @@ class InspectableWebContentsImpl :
// content::WebContentsObserver: // content::WebContentsObserver:
virtual void AboutToNavigateRenderView(content::RenderViewHost* render_view_host) override; virtual void AboutToNavigateRenderView(content::RenderViewHost* render_view_host) override;
virtual void DidFinishLoad(content::RenderFrameHost* render_frame_host, virtual void DidFinishLoad(content::RenderFrameHost* render_frame_host,
const GURL& validated_url) OVERRIDE; const GURL& validated_url) override;
virtual void WebContentsDestroyed() OVERRIDE; virtual void WebContentsDestroyed() override;
// content::WebContentsDelegate // content::WebContentsDelegate
@ -114,10 +114,10 @@ class InspectableWebContentsImpl :
int32 level, int32 level,
const base::string16& message, const base::string16& message,
int32 line_no, int32 line_no,
const base::string16& source_id) OVERRIDE; const base::string16& source_id) override;
virtual void HandleKeyboardEvent( virtual void HandleKeyboardEvent(
content::WebContents*, const content::NativeWebKeyboardEvent&) OVERRIDE; content::WebContents*, const content::NativeWebKeyboardEvent&) override;
virtual void CloseContents(content::WebContents* source) OVERRIDE; virtual void CloseContents(content::WebContents* source) override;
scoped_ptr<content::WebContents> web_contents_; scoped_ptr<content::WebContents> web_contents_;
scoped_ptr<content::WebContents> devtools_web_contents_; scoped_ptr<content::WebContents> devtools_web_contents_;

12
brightray/browser/inspectable_web_contents_view_mac.h
View file

@ -17,13 +17,13 @@ class InspectableWebContentsViewMac : public InspectableWebContentsView {
InspectableWebContentsImpl* inspectable_web_contents_impl); InspectableWebContentsImpl* inspectable_web_contents_impl);
virtual ~InspectableWebContentsViewMac(); virtual ~InspectableWebContentsViewMac();
virtual gfx::NativeView GetNativeView() const OVERRIDE; virtual gfx::NativeView GetNativeView() const override;
virtual void ShowDevTools() OVERRIDE; virtual void ShowDevTools() override;
virtual void CloseDevTools() OVERRIDE; virtual void CloseDevTools() override;
virtual bool IsDevToolsViewShowing() OVERRIDE; virtual bool IsDevToolsViewShowing() override;
virtual void SetIsDocked(bool docked) OVERRIDE; virtual void SetIsDocked(bool docked) override;
virtual void SetContentsResizingStrategy( virtual void SetContentsResizingStrategy(
const DevToolsContentsResizingStrategy& strategy) OVERRIDE; const DevToolsContentsResizingStrategy& strategy) override;
InspectableWebContentsImpl* inspectable_web_contents() { InspectableWebContentsImpl* inspectable_web_contents() {
return inspectable_web_contents_; return inspectable_web_contents_;

2
brightray/browser/linux/notification_presenter_linux.h
View file

@ -28,7 +28,7 @@ class NotificationPresenterLinux : public NotificationPresenter {
virtual void ShowNotification( virtual void ShowNotification(
const content::ShowDesktopNotificationHostMsgParams&, const content::ShowDesktopNotificationHostMsgParams&,
scoped_ptr<content::DesktopNotificationDelegate> delegate, scoped_ptr<content::DesktopNotificationDelegate> delegate,
base::Closure* cancel_callback) OVERRIDE; base::Closure* cancel_callback) override;
void CancelNotification(NotifyNotification* notification); void CancelNotification(NotifyNotification* notification);
void DeleteNotification(NotifyNotification* notification); void DeleteNotification(NotifyNotification* notification);

10
brightray/browser/media/media_capture_devices_dispatcher.h
View file

@ -51,8 +51,8 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver {
void DisableDeviceEnumerationForTesting(); void DisableDeviceEnumerationForTesting();
// Overridden from content::MediaObserver: // Overridden from content::MediaObserver:
virtual void OnAudioCaptureDevicesChanged() OVERRIDE; virtual void OnAudioCaptureDevicesChanged() override;
virtual void OnVideoCaptureDevicesChanged() OVERRIDE; virtual void OnVideoCaptureDevicesChanged() override;
virtual void OnMediaRequestStateChanged( virtual void OnMediaRequestStateChanged(
int render_process_id, int render_process_id,
int render_view_id, int render_view_id,
@ -64,13 +64,13 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver {
int render_process_id, int render_process_id,
int render_frame_id, int render_frame_id,
int stream_id, int stream_id,
const ReadPowerAndClipCallback& power_read_callback) OVERRIDE; const ReadPowerAndClipCallback& power_read_callback) override;
virtual void OnAudioStreamStopped( virtual void OnAudioStreamStopped(
int render_process_id, int render_process_id,
int render_frame_id, int render_frame_id,
int stream_id) OVERRIDE; int stream_id) override;
virtual void OnCreatingAudioStream(int render_process_id, virtual void OnCreatingAudioStream(int render_process_id,
int render_view_id) OVERRIDE; int render_view_id) override;
private: private:
friend struct DefaultSingletonTraits<MediaCaptureDevicesDispatcher>; friend struct DefaultSingletonTraits<MediaCaptureDevicesDispatcher>;

32
brightray/browser/network_delegate.h
View file

@ -17,44 +17,44 @@ class NetworkDelegate : public net::NetworkDelegate {
protected: protected:
virtual int OnBeforeURLRequest(net::URLRequest* request, virtual int OnBeforeURLRequest(net::URLRequest* request,
const net::CompletionCallback& callback, const net::CompletionCallback& callback,
GURL* new_url) OVERRIDE; GURL* new_url) override;
virtual int OnBeforeSendHeaders(net::URLRequest* request, virtual int OnBeforeSendHeaders(net::URLRequest* request,
const net::CompletionCallback& callback, const net::CompletionCallback& callback,
net::HttpRequestHeaders* headers) OVERRIDE; net::HttpRequestHeaders* headers) override;
virtual void OnSendHeaders(net::URLRequest* request, virtual void OnSendHeaders(net::URLRequest* request,
const net::HttpRequestHeaders& headers) OVERRIDE; const net::HttpRequestHeaders& headers) override;
virtual int OnHeadersReceived( virtual int OnHeadersReceived(
net::URLRequest* request, net::URLRequest* request,
const net::CompletionCallback& callback, const net::CompletionCallback& callback,
const net::HttpResponseHeaders* original_response_headers, const net::HttpResponseHeaders* original_response_headers,
scoped_refptr<net::HttpResponseHeaders>* override_response_headers, scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
GURL* allowed_unsafe_redirect_url) OVERRIDE; GURL* allowed_unsafe_redirect_url) override;
virtual void OnBeforeRedirect(net::URLRequest* request, virtual void OnBeforeRedirect(net::URLRequest* request,
const GURL& new_location) OVERRIDE; const GURL& new_location) override;
virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE; virtual void OnResponseStarted(net::URLRequest* request) override;
virtual void OnRawBytesRead(const net::URLRequest& request, virtual void OnRawBytesRead(const net::URLRequest& request,
int bytes_read) OVERRIDE; int bytes_read) override;
virtual void OnCompleted(net::URLRequest* request, bool started) OVERRIDE; virtual void OnCompleted(net::URLRequest* request, bool started) override;
virtual void OnURLRequestDestroyed(net::URLRequest* request) OVERRIDE; virtual void OnURLRequestDestroyed(net::URLRequest* request) override;
virtual void OnPACScriptError(int line_number, virtual void OnPACScriptError(int line_number,
const base::string16& error) OVERRIDE; const base::string16& error) override;
virtual AuthRequiredResponse OnAuthRequired( virtual AuthRequiredResponse OnAuthRequired(
net::URLRequest* request, net::URLRequest* request,
const net::AuthChallengeInfo& auth_info, const net::AuthChallengeInfo& auth_info,
const AuthCallback& callback, const AuthCallback& callback,
net::AuthCredentials* credentials) OVERRIDE; net::AuthCredentials* credentials) override;
virtual bool OnCanGetCookies(const net::URLRequest& request, virtual bool OnCanGetCookies(const net::URLRequest& request,
const net::CookieList& cookie_list) OVERRIDE; const net::CookieList& cookie_list) override;
virtual bool OnCanSetCookie(const net::URLRequest& request, virtual bool OnCanSetCookie(const net::URLRequest& request,
const std::string& cookie_line, const std::string& cookie_line,
net::CookieOptions* options) OVERRIDE; net::CookieOptions* options) override;
virtual bool OnCanAccessFile(const net::URLRequest& request, virtual bool OnCanAccessFile(const net::URLRequest& request,
const base::FilePath& path) const OVERRIDE; const base::FilePath& path) const override;
virtual bool OnCanThrottleRequest( virtual bool OnCanThrottleRequest(
const net::URLRequest& request) const OVERRIDE; const net::URLRequest& request) const override;
virtual int OnBeforeSocketStreamConnect( virtual int OnBeforeSocketStreamConnect(
net::SocketStream* stream, net::SocketStream* stream,
const net::CompletionCallback& callback) OVERRIDE; const net::CompletionCallback& callback) override;
private: private:
DISALLOW_COPY_AND_ASSIGN(NetworkDelegate); DISALLOW_COPY_AND_ASSIGN(NetworkDelegate);

4
brightray/browser/url_request_context_getter.h
View file

@ -48,8 +48,8 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
virtual ~URLRequestContextGetter(); virtual ~URLRequestContextGetter();
// net::URLRequestContextGetter: // net::URLRequestContextGetter:
virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE; virtual net::URLRequestContext* GetURLRequestContext() override;
virtual scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner() const OVERRIDE; virtual scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner() const override;
net::HostResolver* host_resolver(); net::HostResolver* host_resolver();

22
brightray/browser/views/inspectable_web_contents_view_views.cc
View file

@ -34,20 +34,20 @@ class DevToolsWindowDelegate : public views::ClientView,
virtual ~DevToolsWindowDelegate() {} virtual ~DevToolsWindowDelegate() {}
// views::WidgetDelegate: // views::WidgetDelegate:
virtual void DeleteDelegate() OVERRIDE { delete this; } virtual void DeleteDelegate() override { delete this; }
virtual views::View* GetInitiallyFocusedView() OVERRIDE { return view_; } virtual views::View* GetInitiallyFocusedView() override { return view_; }
virtual bool CanResize() const OVERRIDE { return true; } virtual bool CanResize() const override { return true; }
virtual bool CanMaximize() const OVERRIDE { return false; } virtual bool CanMaximize() const override { return false; }
virtual base::string16 GetWindowTitle() const OVERRIDE { return title_; } virtual base::string16 GetWindowTitle() const override { return title_; }
virtual gfx::ImageSkia GetWindowAppIcon() OVERRIDE { return GetWindowIcon(); } virtual gfx::ImageSkia GetWindowAppIcon() override { return GetWindowIcon(); }
virtual gfx::ImageSkia GetWindowIcon() OVERRIDE { return icon_; } virtual gfx::ImageSkia GetWindowIcon() override { return icon_; }
virtual views::Widget* GetWidget() OVERRIDE { return widget_; } virtual views::Widget* GetWidget() override { return widget_; }
virtual const views::Widget* GetWidget() const OVERRIDE { return widget_; } virtual const views::Widget* GetWidget() const override { return widget_; }
virtual views::View* GetContentsView() OVERRIDE { return view_; } virtual views::View* GetContentsView() override { return view_; }
virtual views::ClientView* CreateClientView(views::Widget* widget) { return this; } virtual views::ClientView* CreateClientView(views::Widget* widget) { return this; }
// views::ClientView: // views::ClientView:
virtual bool CanClose() OVERRIDE { virtual bool CanClose() override {
shell_->inspectable_web_contents()->CloseDevTools(); shell_->inspectable_web_contents()->CloseDevTools();
return false; return false;
} }

16
brightray/browser/views/inspectable_web_contents_view_views.h
View file

@ -24,14 +24,14 @@ class InspectableWebContentsViewViews : public InspectableWebContentsView,
~InspectableWebContentsViewViews(); ~InspectableWebContentsViewViews();
// InspectableWebContentsView: // InspectableWebContentsView:
virtual views::View* GetView() OVERRIDE; virtual views::View* GetView() override;
virtual views::View* GetWebView() OVERRIDE; virtual views::View* GetWebView() override;
virtual void ShowDevTools() OVERRIDE; virtual void ShowDevTools() override;
virtual void CloseDevTools() OVERRIDE; virtual void CloseDevTools() override;
virtual bool IsDevToolsViewShowing() OVERRIDE; virtual bool IsDevToolsViewShowing() override;
virtual void SetIsDocked(bool docked) OVERRIDE; virtual void SetIsDocked(bool docked) override;
virtual void SetContentsResizingStrategy( virtual void SetContentsResizingStrategy(
const DevToolsContentsResizingStrategy& strategy) OVERRIDE; const DevToolsContentsResizingStrategy& strategy) override;
InspectableWebContentsImpl* inspectable_web_contents() { InspectableWebContentsImpl* inspectable_web_contents() {
return inspectable_web_contents_; return inspectable_web_contents_;
@ -39,7 +39,7 @@ class InspectableWebContentsViewViews : public InspectableWebContentsView,
private: private:
// views::View: // views::View:
virtual void Layout() OVERRIDE; virtual void Layout() override;
// Owns us. // Owns us.
InspectableWebContentsImpl* inspectable_web_contents_; InspectableWebContentsImpl* inspectable_web_contents_;

28
brightray/browser/views/views_delegate.h
View file

@ -20,38 +20,38 @@ class ViewsDelegate : public views::ViewsDelegate {
virtual void SaveWindowPlacement(const views::Widget* window, virtual void SaveWindowPlacement(const views::Widget* window,
const std::string& window_name, const std::string& window_name,
const gfx::Rect& bounds, const gfx::Rect& bounds,
ui::WindowShowState show_state) OVERRIDE; ui::WindowShowState show_state) override;
virtual bool GetSavedWindowPlacement( virtual bool GetSavedWindowPlacement(
const views::Widget* widget, const views::Widget* widget,
const std::string& window_name, const std::string& window_name,
gfx::Rect* bounds, gfx::Rect* bounds,
ui::WindowShowState* show_state) const OVERRIDE; ui::WindowShowState* show_state) const override;
virtual void NotifyAccessibilityEvent( virtual void NotifyAccessibilityEvent(
views::View* view, ui::AXEvent event_type) OVERRIDE; views::View* view, ui::AXEvent event_type) override;
virtual void NotifyMenuItemFocused(const base::string16& menu_name, virtual void NotifyMenuItemFocused(const base::string16& menu_name,
const base::string16& menu_item_name, const base::string16& menu_item_name,
int item_index, int item_index,
int item_count, int item_count,
bool has_submenu) OVERRIDE; bool has_submenu) override;
#if defined(OS_WIN) #if defined(OS_WIN)
virtual HICON GetDefaultWindowIcon() const OVERRIDE; virtual HICON GetDefaultWindowIcon() const override;
virtual bool IsWindowInMetro(gfx::NativeWindow window) const OVERRIDE; virtual bool IsWindowInMetro(gfx::NativeWindow window) const override;
#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) #elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
virtual gfx::ImageSkia* GetDefaultWindowIcon() const OVERRIDE; virtual gfx::ImageSkia* GetDefaultWindowIcon() const override;
#endif #endif
virtual views::NonClientFrameView* CreateDefaultNonClientFrameView( virtual views::NonClientFrameView* CreateDefaultNonClientFrameView(
views::Widget* widget) OVERRIDE; views::Widget* widget) override;
virtual void AddRef() OVERRIDE; virtual void AddRef() override;
virtual void ReleaseRef() OVERRIDE; virtual void ReleaseRef() override;
virtual content::WebContents* CreateWebContents( virtual content::WebContents* CreateWebContents(
content::BrowserContext* browser_context, content::BrowserContext* browser_context,
content::SiteInstance* site_instance) OVERRIDE; content::SiteInstance* site_instance) override;
virtual void OnBeforeWidgetInit( virtual void OnBeforeWidgetInit(
views::Widget::InitParams* params, views::Widget::InitParams* params,
views::internal::NativeWidgetDelegate* delegate) OVERRIDE; views::internal::NativeWidgetDelegate* delegate) override;
virtual base::TimeDelta GetDefaultTextfieldObscuredRevealDuration() OVERRIDE; virtual base::TimeDelta GetDefaultTextfieldObscuredRevealDuration() override;
virtual bool WindowManagerProvidesTitleBar(bool maximized) OVERRIDE; virtual bool WindowManagerProvidesTitleBar(bool maximized) override;
private: private:
DISALLOW_COPY_AND_ASSIGN(ViewsDelegate); DISALLOW_COPY_AND_ASSIGN(ViewsDelegate);

8
brightray/browser/web_ui_controller_factory.h
View file

@ -19,14 +19,14 @@ class WebUIControllerFactory : public content::WebUIControllerFactory {
virtual ~WebUIControllerFactory(); virtual ~WebUIControllerFactory();
virtual content::WebUI::TypeID GetWebUIType( virtual content::WebUI::TypeID GetWebUIType(
content::BrowserContext* browser_context, const GURL& url) const OVERRIDE; content::BrowserContext* browser_context, const GURL& url) const override;
virtual bool UseWebUIForURL(content::BrowserContext* browser_context, virtual bool UseWebUIForURL(content::BrowserContext* browser_context,
const GURL& url) const OVERRIDE; const GURL& url) const override;
virtual bool UseWebUIBindingsForURL(content::BrowserContext* browser_context, virtual bool UseWebUIBindingsForURL(content::BrowserContext* browser_context,
const GURL& url) const OVERRIDE; const GURL& url) const override;
virtual content::WebUIController* CreateWebUIControllerForURL( virtual content::WebUIController* CreateWebUIControllerForURL(
content::WebUI* web_ui, content::WebUI* web_ui,
const GURL& url) const OVERRIDE; const GURL& url) const override;
static WebUIControllerFactory* GetInstance(); static WebUIControllerFactory* GetInstance();

8
brightray/common/content_client.h
View file

@ -16,11 +16,11 @@ class ContentClient : public content::ContentClient {
~ContentClient(); ~ContentClient();
private: private:
virtual std::string GetProduct() const OVERRIDE; virtual std::string GetProduct() const override;
virtual std::string GetUserAgent() const OVERRIDE; virtual std::string GetUserAgent() const override;
virtual base::StringPiece GetDataResource(int resource_id, virtual base::StringPiece GetDataResource(int resource_id,
ui::ScaleFactor) const OVERRIDE; ui::ScaleFactor) const override;
virtual gfx::Image& GetNativeImageNamed(int resource_id) const OVERRIDE; virtual gfx::Image& GetNativeImageNamed(int resource_id) const override;
DISALLOW_COPY_AND_ASSIGN(ContentClient); DISALLOW_COPY_AND_ASSIGN(ContentClient);
}; };

6
brightray/common/main_delegate.h
View file

@ -49,11 +49,11 @@ class MainDelegate : public content::ContentMainDelegate {
virtual void OverrideFrameworkBundlePath(); virtual void OverrideFrameworkBundlePath();
#endif #endif
virtual bool BasicStartupComplete(int* exit_code) OVERRIDE; virtual bool BasicStartupComplete(int* exit_code) override;
virtual void PreSandboxStartup() OVERRIDE; virtual void PreSandboxStartup() override;
private: private:
virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE; virtual content::ContentBrowserClient* CreateContentBrowserClient() override;
void InitializeResourceBundle(); void InitializeResourceBundle();