Skip to content

Commit

Permalink
Replacing the OVERRIDE with override and FINAL with final in content/…
Browse files Browse the repository at this point in the history 
…browser/frame_host

This step is a giant search and replace for OVERRIDE and FINAL to
replace them with their lowercase versions.

BUG=417463

Review URL: https://codereview.chromium.org/631013003

Cr-Commit-Position: refs/heads/master@{#298392}
  • Loading branch information
@mohan-486
mohan-486 authored and Commit bot committed Oct 7, 2014
1 parent a789156 commit 383f53b
Show file tree
Hide file tree
Showing 19 changed files with 334 additions and 334 deletions.
2 changes: 1 addition & 1 deletion content/browser/frame_host/frame_tree_browsertest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ class CrossProcessFrameTreeBrowserTest : public ContentBrowserTest {
public:
CrossProcessFrameTreeBrowserTest() {}

virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE {
virtual void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(switches::kSitePerProcess);
}

Expand Down
8 changes: 4 additions & 4 deletions content/browser/frame_host/frame_tree_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,22 @@ class TreeWalkingWebContentsLogger : public WebContentsObserver {
}

// content::WebContentsObserver implementation.
virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) OVERRIDE {
virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) override {
LogWhatHappened("RenderFrameCreated", render_frame_host);
}

virtual void RenderFrameHostChanged(RenderFrameHost* old_host,
RenderFrameHost* new_host) OVERRIDE {
RenderFrameHost* new_host) override {
if (old_host)
LogWhatHappened("RenderFrameChanged(old)", old_host);
LogWhatHappened("RenderFrameChanged(new)", new_host);
}

virtual void RenderFrameDeleted(RenderFrameHost* render_frame_host) OVERRIDE {
virtual void RenderFrameDeleted(RenderFrameHost* render_frame_host) override {
LogWhatHappened("RenderFrameDeleted", render_frame_host);
}

virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE {
virtual void RenderProcessGone(base::TerminationStatus status) override {
LogWhatHappened("RenderProcessGone");
}

Expand Down
12 changes: 6 additions & 6 deletions content/browser/frame_host/interstitial_page_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,17 @@ class InterstitialPageImpl::InterstitialPageRVHDelegateView
int selected_item,
const std::vector<MenuItem>& items,
bool right_aligned,
bool allow_multiple_selection) OVERRIDE;
virtual void HidePopupMenu() OVERRIDE;
bool allow_multiple_selection) override;
virtual void HidePopupMenu() override;
#endif
virtual void StartDragging(const DropData& drop_data,
WebDragOperationsMask operations_allowed,
const gfx::ImageSkia& image,
const gfx::Vector2d& image_offset,
const DragEventSourceInfo& event_info) OVERRIDE;
virtual void UpdateDragCursor(WebDragOperation operation) OVERRIDE;
virtual void GotFocus() OVERRIDE;
virtual void TakeFocus(bool reverse) OVERRIDE;
const DragEventSourceInfo& event_info) override;
virtual void UpdateDragCursor(WebDragOperation operation) override;
virtual void GotFocus() override;
virtual void TakeFocus(bool reverse) override;
virtual void OnFindReply(int request_id,
int number_of_matches,
const gfx::Rect& selection_rect,
Expand Down
74 changes: 37 additions & 37 deletions content/browser/frame_host/interstitial_page_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ class CONTENT_EXPORT InterstitialPageImpl
virtual ~InterstitialPageImpl();

// InterstitialPage implementation:
virtual void Show() OVERRIDE;
virtual void Hide() OVERRIDE;
virtual void DontProceed() OVERRIDE;
virtual void Proceed() OVERRIDE;
virtual RenderViewHost* GetRenderViewHostForTesting() const OVERRIDE;
virtual InterstitialPageDelegate* GetDelegateForTesting() OVERRIDE;
virtual void DontCreateViewForTesting() OVERRIDE;
virtual void SetSize(const gfx::Size& size) OVERRIDE;
virtual void Focus() OVERRIDE;
virtual void Show() override;
virtual void Hide() override;
virtual void DontProceed() override;
virtual void Proceed() override;
virtual RenderViewHost* GetRenderViewHostForTesting() const override;
virtual InterstitialPageDelegate* GetDelegateForTesting() override;
virtual void DontCreateViewForTesting() override;
virtual void SetSize(const gfx::Size& size) override;
virtual void Focus() override;

// Allows the user to navigate away by disabling the interstitial, canceling
// the pending request, and unblocking the hidden renderer. The interstitial
Expand Down Expand Up @@ -101,72 +101,72 @@ class CONTENT_EXPORT InterstitialPageImpl
// NotificationObserver method:
virtual void Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) OVERRIDE;
const NotificationDetails& details) override;

// WebContentsObserver implementation:
virtual bool OnMessageReceived(const IPC::Message& message,
RenderFrameHost* render_frame_host) OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
virtual void WebContentsDestroyed() OVERRIDE;
RenderFrameHost* render_frame_host) override;
virtual bool OnMessageReceived(const IPC::Message& message) override;
virtual void WebContentsDestroyed() override;
virtual void NavigationEntryCommitted(
const LoadCommittedDetails& load_details) OVERRIDE;
const LoadCommittedDetails& load_details) override;

// RenderFrameHostDelegate implementation:
virtual bool OnMessageReceived(RenderFrameHost* render_frame_host,
const IPC::Message& message) OVERRIDE;
virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) OVERRIDE;
const IPC::Message& message) override;
virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) override;
virtual void UpdateTitle(RenderFrameHost* render_frame_host,
int32 page_id,
const base::string16& title,
base::i18n::TextDirection title_direction) OVERRIDE;
virtual AccessibilityMode GetAccessibilityMode() const OVERRIDE;
base::i18n::TextDirection title_direction) override;
virtual AccessibilityMode GetAccessibilityMode() const override;

// RenderViewHostDelegate implementation:
virtual RenderViewHostDelegateView* GetDelegateView() OVERRIDE;
virtual RenderViewHostDelegateView* GetDelegateView() override;
virtual bool OnMessageReceived(RenderViewHost* render_view_host,
const IPC::Message& message) OVERRIDE;
virtual const GURL& GetMainFrameLastCommittedURL() const OVERRIDE;
const IPC::Message& message) override;
virtual const GURL& GetMainFrameLastCommittedURL() const override;
virtual void RenderViewTerminated(RenderViewHost* render_view_host,
base::TerminationStatus status,
int error_code) OVERRIDE;
int error_code) override;
virtual RendererPreferences GetRendererPrefs(
BrowserContext* browser_context) const OVERRIDE;
virtual WebPreferences ComputeWebkitPrefs() OVERRIDE;
virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE;
BrowserContext* browser_context) const override;
virtual WebPreferences ComputeWebkitPrefs() override;
virtual gfx::Rect GetRootWindowResizerRect() const override;
virtual void CreateNewWindow(
int render_process_id,
int route_id,
int main_frame_route_id,
const ViewHostMsg_CreateWindow_Params& params,
SessionStorageNamespace* session_storage_namespace) OVERRIDE;
SessionStorageNamespace* session_storage_namespace) override;
virtual void CreateNewWidget(int render_process_id,
int route_id,
blink::WebPopupType popup_type) OVERRIDE;
blink::WebPopupType popup_type) override;
virtual void CreateNewFullscreenWidget(int render_process_id,
int route_id) OVERRIDE;
int route_id) override;
virtual void ShowCreatedWindow(int route_id,
WindowOpenDisposition disposition,
const gfx::Rect& initial_pos,
bool user_gesture) OVERRIDE;
bool user_gesture) override;
virtual void ShowCreatedWidget(int route_id,
const gfx::Rect& initial_pos) OVERRIDE;
virtual void ShowCreatedFullscreenWidget(int route_id) OVERRIDE;
const gfx::Rect& initial_pos) override;
virtual void ShowCreatedFullscreenWidget(int route_id) override;

virtual SessionStorageNamespace* GetSessionStorageNamespace(
SiteInstance* instance) OVERRIDE;
SiteInstance* instance) override;

virtual FrameTree* GetFrameTree() OVERRIDE;
virtual FrameTree* GetFrameTree() override;

// RenderWidgetHostDelegate implementation:
virtual void RenderWidgetDeleted(
RenderWidgetHostImpl* render_widget_host) OVERRIDE;
RenderWidgetHostImpl* render_widget_host) override;
virtual bool PreHandleKeyboardEvent(
const NativeWebKeyboardEvent& event,
bool* is_keyboard_shortcut) OVERRIDE;
bool* is_keyboard_shortcut) override;
virtual void HandleKeyboardEvent(
const NativeWebKeyboardEvent& event) OVERRIDE;
const NativeWebKeyboardEvent& event) override;
#if defined(OS_WIN)
virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() OVERRIDE;
virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() override;
#endif

bool enabled() const { return enabled_; }
Expand Down
4 changes: 2 additions & 2 deletions content/browser/frame_host/interstitial_page_navigator_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ class CONTENT_EXPORT InterstitialPageNavigatorImpl : public Navigator {
InterstitialPageImpl* interstitial,
NavigationControllerImpl* navigation_controller);

virtual NavigationController* GetController() OVERRIDE;
virtual NavigationController* GetController() override;
virtual void DidNavigate(
RenderFrameHostImpl* render_frame_host,
const FrameHostMsg_DidCommitProvisionalLoad_Params&
input_params) OVERRIDE;
input_params) override;

private:
virtual ~InterstitialPageNavigatorImpl() {}
Expand Down
94 changes: 47 additions & 47 deletions content/browser/frame_host/navigation_controller_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,65 +34,65 @@ class CONTENT_EXPORT NavigationControllerImpl
virtual ~NavigationControllerImpl();

// NavigationController implementation:
virtual WebContents* GetWebContents() const OVERRIDE;
virtual BrowserContext* GetBrowserContext() const OVERRIDE;
virtual WebContents* GetWebContents() const override;
virtual BrowserContext* GetBrowserContext() const override;
virtual void SetBrowserContext(
BrowserContext* browser_context) OVERRIDE;
BrowserContext* browser_context) override;
virtual void Restore(
int selected_navigation,
RestoreType type,
std::vector<NavigationEntry*>* entries) OVERRIDE;
virtual NavigationEntry* GetActiveEntry() const OVERRIDE;
virtual NavigationEntry* GetVisibleEntry() const OVERRIDE;
virtual int GetCurrentEntryIndex() const OVERRIDE;
virtual NavigationEntry* GetLastCommittedEntry() const OVERRIDE;
virtual int GetLastCommittedEntryIndex() const OVERRIDE;
virtual bool CanViewSource() const OVERRIDE;
virtual int GetEntryCount() const OVERRIDE;
virtual NavigationEntry* GetEntryAtIndex(int index) const OVERRIDE;
virtual NavigationEntry* GetEntryAtOffset(int offset) const OVERRIDE;
virtual void DiscardNonCommittedEntries() OVERRIDE;
virtual NavigationEntry* GetPendingEntry() const OVERRIDE;
virtual int GetPendingEntryIndex() const OVERRIDE;
virtual NavigationEntry* GetTransientEntry() const OVERRIDE;
virtual void SetTransientEntry(NavigationEntry* entry) OVERRIDE;
std::vector<NavigationEntry*>* entries) override;
virtual NavigationEntry* GetActiveEntry() const override;
virtual NavigationEntry* GetVisibleEntry() const override;
virtual int GetCurrentEntryIndex() const override;
virtual NavigationEntry* GetLastCommittedEntry() const override;
virtual int GetLastCommittedEntryIndex() const override;
virtual bool CanViewSource() const override;
virtual int GetEntryCount() const override;
virtual NavigationEntry* GetEntryAtIndex(int index) const override;
virtual NavigationEntry* GetEntryAtOffset(int offset) const override;
virtual void DiscardNonCommittedEntries() override;
virtual NavigationEntry* GetPendingEntry() const override;
virtual int GetPendingEntryIndex() const override;
virtual NavigationEntry* GetTransientEntry() const override;
virtual void SetTransientEntry(NavigationEntry* entry) override;
virtual void LoadURL(const GURL& url,
const Referrer& referrer,
ui::PageTransition type,
const std::string& extra_headers) OVERRIDE;
virtual void LoadURLWithParams(const LoadURLParams& params) OVERRIDE;
virtual void LoadIfNecessary() OVERRIDE;
virtual bool CanGoBack() const OVERRIDE;
virtual bool CanGoForward() const OVERRIDE;
virtual bool CanGoToOffset(int offset) const OVERRIDE;
virtual void GoBack() OVERRIDE;
virtual void GoForward() OVERRIDE;
virtual void GoToIndex(int index) OVERRIDE;
virtual void GoToOffset(int offset) OVERRIDE;
virtual bool RemoveEntryAtIndex(int index) OVERRIDE;
const std::string& extra_headers) override;
virtual void LoadURLWithParams(const LoadURLParams& params) override;
virtual void LoadIfNecessary() override;
virtual bool CanGoBack() const override;
virtual bool CanGoForward() const override;
virtual bool CanGoToOffset(int offset) const override;
virtual void GoBack() override;
virtual void GoForward() override;
virtual void GoToIndex(int index) override;
virtual void GoToOffset(int offset) override;
virtual bool RemoveEntryAtIndex(int index) override;
virtual const SessionStorageNamespaceMap&
GetSessionStorageNamespaceMap() const OVERRIDE;
GetSessionStorageNamespaceMap() const override;
virtual SessionStorageNamespace*
GetDefaultSessionStorageNamespace() OVERRIDE;
virtual void SetMaxRestoredPageID(int32 max_id) OVERRIDE;
virtual int32 GetMaxRestoredPageID() const OVERRIDE;
virtual bool NeedsReload() const OVERRIDE;
virtual void SetNeedsReload() OVERRIDE;
virtual void CancelPendingReload() OVERRIDE;
virtual void ContinuePendingReload() OVERRIDE;
virtual bool IsInitialNavigation() const OVERRIDE;
virtual void Reload(bool check_for_repost) OVERRIDE;
virtual void ReloadIgnoringCache(bool check_for_repost) OVERRIDE;
virtual void ReloadOriginalRequestURL(bool check_for_repost) OVERRIDE;
GetDefaultSessionStorageNamespace() override;
virtual void SetMaxRestoredPageID(int32 max_id) override;
virtual int32 GetMaxRestoredPageID() const override;
virtual bool NeedsReload() const override;
virtual void SetNeedsReload() override;
virtual void CancelPendingReload() override;
virtual void ContinuePendingReload() override;
virtual bool IsInitialNavigation() const override;
virtual void Reload(bool check_for_repost) override;
virtual void ReloadIgnoringCache(bool check_for_repost) override;
virtual void ReloadOriginalRequestURL(bool check_for_repost) override;
virtual void NotifyEntryChanged(const NavigationEntry* entry,
int index) OVERRIDE;
int index) override;
virtual void CopyStateFrom(
const NavigationController& source) OVERRIDE;
const NavigationController& source) override;
virtual void CopyStateFromAndPrune(NavigationController* source,
bool replace_entry) OVERRIDE;
virtual bool CanPruneAllButLastCommitted() OVERRIDE;
virtual void PruneAllButLastCommitted() OVERRIDE;
virtual void ClearAllScreenshots() OVERRIDE;
bool replace_entry) override;
virtual bool CanPruneAllButLastCommitted() override;
virtual void PruneAllButLastCommitted() override;
virtual void ClearAllScreenshots() override;

// Whether this is the initial navigation in an unmodified new tab. In this
// case, we know there is no content displayed in the page.
Expand Down
16 changes: 8 additions & 8 deletions content/browser/frame_host/navigation_controller_impl_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ class MockScreenshotManager : public content::NavigationEntryScreenshotManager {
// Overridden from content::NavigationEntryScreenshotManager:
virtual void TakeScreenshotImpl(
content::RenderViewHost* host,
content::NavigationEntryImpl* entry) OVERRIDE {
content::NavigationEntryImpl* entry) override {
}

virtual void OnScreenshotSet(content::NavigationEntryImpl* entry) OVERRIDE {
virtual void OnScreenshotSet(content::NavigationEntryImpl* entry) override {
encoding_screenshot_in_progress_ = false;
NavigationEntryScreenshotManager::OnScreenshotSet(entry);
if (message_loop_runner_.get())
Expand Down Expand Up @@ -188,7 +188,7 @@ class NavigationControllerTest
NavigationControllerTest() : navigation_entry_committed_counter_(0) {
}

virtual void SetUp() OVERRIDE {
virtual void SetUp() override {
RenderViewHostImplTestHarness::SetUp();
WebContents* web_contents = RenderViewHostImplTestHarness::web_contents();
ASSERT_TRUE(web_contents); // The WebContents should be created by now.
Expand All @@ -198,12 +198,12 @@ class NavigationControllerTest
// WebContentsObserver:
virtual void DidStartNavigationToPendingEntry(
const GURL& url,
NavigationController::ReloadType reload_type) OVERRIDE {
NavigationController::ReloadType reload_type) override {
navigated_url_ = url;
}

virtual void NavigationEntryCommitted(
const LoadCommittedDetails& load_details) OVERRIDE {
const LoadCommittedDetails& load_details) override {
navigation_entry_committed_counter_++;
}

Expand Down Expand Up @@ -248,11 +248,11 @@ class TestWebContentsDelegate : public WebContentsDelegate {

// Keep track of whether the tab has notified us of a navigation state change.
virtual void NavigationStateChanged(const WebContents* source,
InvalidateTypes changed_flags) OVERRIDE {
InvalidateTypes changed_flags) override {
navigation_state_change_count_++;
}

virtual void ShowRepostFormWarningDialog(WebContents* source) OVERRIDE {
virtual void ShowRepostFormWarningDialog(WebContents* source) override {
repost_form_warning_count_++;
}

Expand Down Expand Up @@ -2294,7 +2294,7 @@ class PrunedListener : public NotificationObserver {

virtual void Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) OVERRIDE {
const NotificationDetails& details) override {
if (type == NOTIFICATION_NAV_LIST_PRUNED) {
notification_count_++;
details_ = *(Details<PrunedDetails>(details).ptr());
Expand Down
Loading

0 comments on commit 383f53b

Please sign in to comment.