summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/login
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-01 19:45:54 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-01 19:45:54 +0000
commitbd021ddd2306afe3e4293a9ba9bde8fdadc8c740 (patch)
treec54b8a7ff72522bcfeba7ac1d8e759058a917e8c /chrome/browser/chromeos/login
parent69e148de891638a541275a1f25d4b3a52487e9aa (diff)
downloadchromium_src-bd021ddd2306afe3e4293a9ba9bde8fdadc8c740.zip
chromium_src-bd021ddd2306afe3e4293a9ba9bde8fdadc8c740.tar.gz
chromium_src-bd021ddd2306afe3e4293a9ba9bde8fdadc8c740.tar.bz2
Removes pure virtual methods from TabContentsDelegate and removes all
empty implementations. BUG=none TEST=none R=brettw@chromium.org Review URL: http://codereview.chromium.org/7302001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91344 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/login')
-rw-r--r--chrome/browser/chromeos/login/enterprise_enrollment_view.cc17
-rw-r--r--chrome/browser/chromeos/login/eula_view.h17
-rw-r--r--chrome/browser/chromeos/login/html_page_screen.cc4
-rw-r--r--chrome/browser/chromeos/login/html_page_screen.h2
-rw-r--r--chrome/browser/chromeos/login/registration_screen.h3
-rw-r--r--chrome/browser/chromeos/login/web_page_screen.h17
-rw-r--r--chrome/browser/chromeos/login/webui_login_view.cc37
-rw-r--r--chrome/browser/chromeos/login/webui_login_view.h18
8 files changed, 0 insertions, 115 deletions
diff --git a/chrome/browser/chromeos/login/enterprise_enrollment_view.cc b/chrome/browser/chromeos/login/enterprise_enrollment_view.cc
index d53196f..24a5a9d 100644
--- a/chrome/browser/chromeos/login/enterprise_enrollment_view.cc
+++ b/chrome/browser/chromeos/login/enterprise_enrollment_view.cc
@@ -48,29 +48,12 @@ class EnrollmentDomView : public WebPageDomView,
}
// TabContentsDelegate implementation:
- virtual void OpenURLFromTab(TabContents* source,
- const GURL& url, const GURL& referrer,
- WindowOpenDisposition disposition,
- PageTransition::Type transition) {}
- virtual void NavigationStateChanged(const TabContents* source,
- unsigned changed_flags) {}
- virtual void AddNewContents(TabContents* source,
- TabContents* new_contents,
- WindowOpenDisposition disposition,
- const gfx::Rect& initial_pos,
- bool user_gesture) {}
- virtual void ActivateContents(TabContents* contents) {}
- virtual void DeactivateContents(TabContents* contents) {}
- virtual void LoadingStateChanged(TabContents* source) {}
- virtual void CloseContents(TabContents* source) {}
virtual bool IsPopup(TabContents* source) { return false; }
- virtual void UpdateTargetURL(TabContents* source, const GURL& url) {}
virtual bool ShouldAddNavigationToHistory(
const history::HistoryAddPageArgs& add_page_args,
NavigationType::Type navigation_type) {
return false;
}
- virtual void MoveContents(TabContents* source, const gfx::Rect& pos) {}
virtual bool HandleContextMenu(const ContextMenuParams& params) {
return true;
}
diff --git a/chrome/browser/chromeos/login/eula_view.h b/chrome/browser/chromeos/login/eula_view.h
index 7d1be91..d45e972 100644
--- a/chrome/browser/chromeos/login/eula_view.h
+++ b/chrome/browser/chromeos/login/eula_view.h
@@ -39,27 +39,10 @@ class EULATabContentsDelegate : public TabContentsDelegate {
protected:
// TabContentsDelegate implementation:
- virtual void OpenURLFromTab(TabContents* source,
- const GURL& url, const GURL& referrer,
- WindowOpenDisposition disposition,
- PageTransition::Type transition) {}
- virtual void NavigationStateChanged(const TabContents* source,
- unsigned changed_flags) {}
- virtual void AddNewContents(TabContents* source,
- TabContents* new_contents,
- WindowOpenDisposition disposition,
- const gfx::Rect& initial_pos,
- bool user_gesture) {}
- virtual void ActivateContents(TabContents* contents) {}
- virtual void DeactivateContents(TabContents* contents) {}
- virtual void LoadingStateChanged(TabContents* source) {}
- virtual void CloseContents(TabContents* source) {}
virtual bool IsPopup(TabContents* source);
- virtual void UpdateTargetURL(TabContents* source, const GURL& url) {}
virtual bool ShouldAddNavigationToHistory(
const history::HistoryAddPageArgs& add_page_args,
NavigationType::Type navigation_type);
- virtual void MoveContents(TabContents* source, const gfx::Rect& pos) {}
virtual bool HandleContextMenu(const ContextMenuParams& params);
private:
diff --git a/chrome/browser/chromeos/login/html_page_screen.cc b/chrome/browser/chromeos/login/html_page_screen.cc
index 45f888d..7834b45 100644
--- a/chrome/browser/chromeos/login/html_page_screen.cc
+++ b/chrome/browser/chromeos/login/html_page_screen.cc
@@ -84,10 +84,6 @@ void HTMLPageScreen::LoadingStateChanged(TabContents* source) {
}
}
-void HTMLPageScreen::NavigationStateChanged(const TabContents* source,
- unsigned changed_flags) {
-}
-
void HTMLPageScreen::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
HandleWebKeyboardEvent(view()->GetWidget(), event);
}
diff --git a/chrome/browser/chromeos/login/html_page_screen.h b/chrome/browser/chromeos/login/html_page_screen.h
index cd64ae1..ba964414 100644
--- a/chrome/browser/chromeos/login/html_page_screen.h
+++ b/chrome/browser/chromeos/login/html_page_screen.h
@@ -69,8 +69,6 @@ class HTMLPageScreen : public ViewScreen<HTMLPageView>,
virtual HTMLPageView* AllocateView();
virtual void LoadingStateChanged(TabContents* source);
- virtual void NavigationStateChanged(const TabContents* source,
- unsigned changed_flags);
virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
// WebPageScreen implementation:
diff --git a/chrome/browser/chromeos/login/registration_screen.h b/chrome/browser/chromeos/login/registration_screen.h
index c2fc3bc..d6adc82 100644
--- a/chrome/browser/chromeos/login/registration_screen.h
+++ b/chrome/browser/chromeos/login/registration_screen.h
@@ -84,9 +84,6 @@ class RegistrationScreen : public ViewScreen<RegistrationView>,
virtual RegistrationView* AllocateView();
// TabContentsDelegate implementation:
- virtual void LoadingStateChanged(TabContents* source) {}
- virtual void NavigationStateChanged(const TabContents* source,
- unsigned changed_flags) {}
virtual void OpenURLFromTab(TabContents* source,
const GURL& url,
const GURL& referrer,
diff --git a/chrome/browser/chromeos/login/web_page_screen.h b/chrome/browser/chromeos/login/web_page_screen.h
index edd4bad..e1c581e 100644
--- a/chrome/browser/chromeos/login/web_page_screen.h
+++ b/chrome/browser/chromeos/login/web_page_screen.h
@@ -25,27 +25,10 @@ class WebPageScreen : public TabContentsDelegate {
protected:
// TabContentsDelegate implementation:
- virtual void OpenURLFromTab(TabContents* source,
- const GURL& url, const GURL& referrer,
- WindowOpenDisposition disposition,
- PageTransition::Type transition) {}
- virtual void NavigationStateChanged(const TabContents* source,
- unsigned changed_flags) = 0;
- virtual void AddNewContents(TabContents* source,
- TabContents* new_contents,
- WindowOpenDisposition disposition,
- const gfx::Rect& initial_pos,
- bool user_gesture) {}
- virtual void ActivateContents(TabContents* contents) {}
- virtual void DeactivateContents(TabContents* contents) {}
- virtual void LoadingStateChanged(TabContents* source) = 0;
- virtual void CloseContents(TabContents* source) {}
virtual bool IsPopup(TabContents* source);
- virtual void UpdateTargetURL(TabContents* source, const GURL& url) {}
virtual bool ShouldAddNavigationToHistory(
const history::HistoryAddPageArgs& add_page_args,
NavigationType::Type navigation_type);
- virtual void MoveContents(TabContents* source, const gfx::Rect& pos) {}
virtual bool HandleContextMenu(const ContextMenuParams& params);
// Called by |timeout_timer_|. Stops page fetching and closes screen.
diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc
index 0e32c20..e3687ae 100644
--- a/chrome/browser/chromeos/login/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/webui_login_view.cc
@@ -149,43 +149,6 @@ void WebUILoginView::InitStatusArea() {
AddChildView(status_area_);
}
-void WebUILoginView::OpenURLFromTab(TabContents* source,
- const GURL& url,
- const GURL& referrer,
- WindowOpenDisposition disposition,
- PageTransition::Type transition) {
-}
-
-void WebUILoginView::NavigationStateChanged(const TabContents* source,
- unsigned changed_flags) {
-}
-
-void WebUILoginView::AddNewContents(TabContents* source,
- TabContents* new_contents,
- WindowOpenDisposition disposition,
- const gfx::Rect& initial_pos,
- bool user_gesture) {
-}
-
-void WebUILoginView::ActivateContents(TabContents* contents) {
-}
-
-void WebUILoginView::DeactivateContents(TabContents* contents) {
-}
-
-void WebUILoginView::LoadingStateChanged(TabContents* source) {
-}
-
-void WebUILoginView::CloseContents(TabContents* source) {
-}
-
-void WebUILoginView::MoveContents(TabContents* source,
- const gfx::Rect& pos) {
-}
-
-void WebUILoginView::UpdateTargetURL(TabContents* source, const GURL& url) {
-}
-
bool WebUILoginView::HandleContextMenu(const ContextMenuParams& params) {
// Do not show the context menu.
return true;
diff --git a/chrome/browser/chromeos/login/webui_login_view.h b/chrome/browser/chromeos/login/webui_login_view.h
index c99e667..30f3f9e 100644
--- a/chrome/browser/chromeos/login/webui_login_view.h
+++ b/chrome/browser/chromeos/login/webui_login_view.h
@@ -73,24 +73,6 @@ class WebUILoginView : public views::View,
void InitStatusArea();
// Overridden from TabContentsDelegate.
- virtual void OpenURLFromTab(TabContents* source,
- const GURL& url,
- const GURL& referrer,
- WindowOpenDisposition disposition,
- PageTransition::Type transition) OVERRIDE;
- virtual void NavigationStateChanged(const TabContents* source,
- unsigned changed_flags) OVERRIDE;
- virtual void AddNewContents(TabContents* source,
- TabContents* new_contents,
- WindowOpenDisposition disposition,
- const gfx::Rect& initial_pos,
- bool user_gesture) OVERRIDE;
- virtual void ActivateContents(TabContents* contents) OVERRIDE;
- virtual void DeactivateContents(TabContents* contents) OVERRIDE;
- virtual void LoadingStateChanged(TabContents* source) OVERRIDE;
- virtual void CloseContents(TabContents* source) OVERRIDE;
- virtual void MoveContents(TabContents* source, const gfx::Rect& pos) OVERRIDE;
- virtual void UpdateTargetURL(TabContents* source, const GURL& url) OVERRIDE;
virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE;
Profile* profile_;