summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-15 22:04:12 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-15 22:04:12 +0000
commit52c6760bbf8ac02513dc686c5b461767fbbf31a5 (patch)
tree460217d1ffb28f445c4975a401c8496ea13c65b8
parent1f71df490a96cdce44d092a8d6a6f9b6248ad5de (diff)
downloadchromium_src-52c6760bbf8ac02513dc686c5b461767fbbf31a5.zip
chromium_src-52c6760bbf8ac02513dc686c5b461767fbbf31a5.tar.gz
chromium_src-52c6760bbf8ac02513dc686c5b461767fbbf31a5.tar.bz2
cros: More method out-of-lining.
BUG=none TEST=none TBR=dpolukhin Review URL: http://codereview.chromium.org/7031001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85432 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/login/eula_view.cc37
-rw-r--r--chrome/browser/chromeos/login/eula_view.h21
-rw-r--r--chrome/browser/chromeos/login/guest_user_view.cc2
-rw-r--r--chrome/browser/chromeos/login/guest_user_view.h1
-rw-r--r--chrome/browser/chromeos/login/html_page_screen.cc6
-rw-r--r--chrome/browser/chromeos/login/html_page_screen.h3
-rw-r--r--chrome/browser/chromeos/login/keyboard_switch_menu.cc4
-rw-r--r--chrome/browser/chromeos/login/keyboard_switch_menu.h2
-rw-r--r--chrome/browser/chromeos/login/user_controller.cc4
-rw-r--r--chrome/browser/chromeos/login/user_controller.h2
-rw-r--r--chrome/browser/chromeos/login/wizard_accessibility_helper.cc2
-rw-r--r--chrome/browser/chromeos/login/wizard_accessibility_helper.h2
12 files changed, 68 insertions, 18 deletions
diff --git a/chrome/browser/chromeos/login/eula_view.cc b/chrome/browser/chromeos/login/eula_view.cc
index d47522d..f9f1fd9 100644
--- a/chrome/browser/chromeos/login/eula_view.cc
+++ b/chrome/browser/chromeos/login/eula_view.cc
@@ -261,6 +261,24 @@ void TpmInfoView::PullPassword() {
namespace chromeos {
////////////////////////////////////////////////////////////////////////////////
+// EULATabContentsDelegate, public:
+
+bool EULATabContentsDelegate::IsPopup(TabContents* source) {
+ return false;
+}
+
+bool EULATabContentsDelegate::ShouldAddNavigationToHistory(
+ const history::HistoryAddPageArgs& add_page_args,
+ NavigationType::Type navigation_type) {
+ return false;
+}
+
+bool EULATabContentsDelegate::HandleContextMenu(
+ const ContextMenuParams& params) {
+ return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////
// EulaView, public:
EulaView::EulaView(chromeos::ScreenObserver* observer)
@@ -552,6 +570,10 @@ void EulaView::LoadEulaView(DOMView* eula_view,
////////////////////////////////////////////////////////////////////////////////
// EulaView, private, views::View implementation:
+bool EulaView::SkipDefaultKeyEventProcessing(const views::KeyEvent& e) {
+ return true;
+}
+
bool EulaView::OnKeyPressed(const views::KeyEvent&) {
// Close message bubble if shown. bubble_ will be set to NULL in callback.
if (bubble_) {
@@ -561,4 +583,19 @@ bool EulaView::OnKeyPressed(const views::KeyEvent&) {
return false;
}
+////////////////////////////////////////////////////////////////////////////////
+// EulaView, private, views::BubbleDelegate implementation:
+
+void EulaView::BubbleClosing(Bubble* bubble, bool closed_by_escape) {
+ bubble_ = NULL;
+}
+
+bool EulaView::CloseOnEscape() {
+ return true;
+}
+
+bool EulaView::FadeInOnShow() {
+ return false;
+}
+
} // namespace chromeos
diff --git a/chrome/browser/chromeos/login/eula_view.h b/chrome/browser/chromeos/login/eula_view.h
index 7751dd1..6b4c8a5 100644
--- a/chrome/browser/chromeos/login/eula_view.h
+++ b/chrome/browser/chromeos/login/eula_view.h
@@ -57,17 +57,13 @@ class EULATabContentsDelegate : public TabContentsDelegate {
virtual void DeactivateContents(TabContents* contents) {}
virtual void LoadingStateChanged(TabContents* source) {}
virtual void CloseContents(TabContents* source) {}
- virtual bool IsPopup(TabContents* source) { return false; }
+ 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) {
- return false;
- }
+ NavigationType::Type navigation_type);
virtual void MoveContents(TabContents* source, const gfx::Rect& pos) {}
- virtual bool HandleContextMenu(const ContextMenuParams& params) {
- return true;
- }
+ virtual bool HandleContextMenu(const ContextMenuParams& params);
private:
DISALLOW_COPY_AND_ASSIGN(EULATabContentsDelegate);
@@ -101,8 +97,7 @@ class EulaView
private:
// views::View implementation.
- virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& e) {
- return true; }
+ virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& e);
virtual bool OnKeyPressed(const views::KeyEvent& e);
// TabContentsDelegate implementation.
@@ -117,11 +112,9 @@ class EulaView
const GURL& eula_url);
// Overridden from views::BubbleDelegate.
- virtual void BubbleClosing(Bubble* bubble, bool closed_by_escape) {
- bubble_ = NULL;
- }
- virtual bool CloseOnEscape() { return true; }
- virtual bool FadeInOnShow() { return false; }
+ virtual void BubbleClosing(Bubble* bubble, bool closed_by_escape);
+ virtual bool CloseOnEscape();
+ virtual bool FadeInOnShow();
virtual void OnHelpLinkActivated() {}
// Dialog controls.
diff --git a/chrome/browser/chromeos/login/guest_user_view.cc b/chrome/browser/chromeos/login/guest_user_view.cc
index 02978e2..7182085 100644
--- a/chrome/browser/chromeos/login/guest_user_view.cc
+++ b/chrome/browser/chromeos/login/guest_user_view.cc
@@ -60,6 +60,8 @@ GuestUserView::GuestUserView(UserController* uc)
AddAccelerator(accel_next_pod_by_arrow_);
}
+GuestUserView::~GuestUserView() {}
+
void GuestUserView::RecreateFields() {
delete submit_button_;
submit_button_ = new UserEntryButton(
diff --git a/chrome/browser/chromeos/login/guest_user_view.h b/chrome/browser/chromeos/login/guest_user_view.h
index f9919c6..42aa3c0 100644
--- a/chrome/browser/chromeos/login/guest_user_view.h
+++ b/chrome/browser/chromeos/login/guest_user_view.h
@@ -25,6 +25,7 @@ class GuestUserView : public ThrobberHostView,
public views::ButtonListener {
public:
explicit GuestUserView(UserController* uc);
+ virtual ~GuestUserView();
void RecreateFields();
diff --git a/chrome/browser/chromeos/login/html_page_screen.cc b/chrome/browser/chromeos/login/html_page_screen.cc
index d87ecec..a493c80 100644
--- a/chrome/browser/chromeos/login/html_page_screen.cc
+++ b/chrome/browser/chromeos/login/html_page_screen.cc
@@ -36,6 +36,10 @@ HTMLPageView::HTMLPageView()
: dom_view_(new HTMLPageDomView()) {
}
+WebPageDomView* HTMLPageView::dom_view() {
+ return dom_view_;
+}
+
///////////////////////////////////////////////////////////////////////////////
// HTMLPageScreen, public:
HTMLPageScreen::HTMLPageScreen(WizardScreenDelegate* delegate,
@@ -43,6 +47,8 @@ HTMLPageScreen::HTMLPageScreen(WizardScreenDelegate* delegate,
: ViewScreen<HTMLPageView>(delegate), url_(url) {
}
+HTMLPageScreen::~HTMLPageScreen() {}
+
///////////////////////////////////////////////////////////////////////////////
// HTMLPageScreen, ViewScreen implementation:
void HTMLPageScreen::CreateView() {
diff --git a/chrome/browser/chromeos/login/html_page_screen.h b/chrome/browser/chromeos/login/html_page_screen.h
index da872e9..cf45ca2 100644
--- a/chrome/browser/chromeos/login/html_page_screen.h
+++ b/chrome/browser/chromeos/login/html_page_screen.h
@@ -36,7 +36,7 @@ class HTMLPageView : public WebPageView {
HTMLPageView();
protected:
- virtual WebPageDomView* dom_view() { return dom_view_; }
+ virtual WebPageDomView* dom_view();
private:
// View that renders page.
@@ -52,6 +52,7 @@ class HTMLPageScreen : public ViewScreen<HTMLPageView>,
public WebPageDelegate {
public:
HTMLPageScreen(WizardScreenDelegate* delegate, const std::string& url);
+ virtual ~HTMLPageScreen();
// WebPageDelegate implementation:
virtual void OnPageLoaded();
diff --git a/chrome/browser/chromeos/login/keyboard_switch_menu.cc b/chrome/browser/chromeos/login/keyboard_switch_menu.cc
index 8b8f731..3bc5dfe 100644
--- a/chrome/browser/chromeos/login/keyboard_switch_menu.cc
+++ b/chrome/browser/chromeos/login/keyboard_switch_menu.cc
@@ -33,6 +33,10 @@ void KeyboardSwitchMenu::UpdateUI(const std::string& input_method_id,
views::Widget::NotifyLocaleChanged();
}
+bool KeyboardSwitchMenu::ShouldSupportConfigUI() {
+ return false;
+}
+
////////////////////////////////////////////////////////////////////////////////
// views::ViewMenuDelegate implementation.
void KeyboardSwitchMenu::RunMenu(views::View* source, const gfx::Point& pt) {
diff --git a/chrome/browser/chromeos/login/keyboard_switch_menu.h b/chrome/browser/chromeos/login/keyboard_switch_menu.h
index f988dab..c103198 100644
--- a/chrome/browser/chromeos/login/keyboard_switch_menu.h
+++ b/chrome/browser/chromeos/login/keyboard_switch_menu.h
@@ -27,7 +27,7 @@ class KeyboardSwitchMenu : public InputMethodMenu {
const std::wstring& name,
const std::wstring& tooltip,
size_t num_active_input_methods);
- virtual bool ShouldSupportConfigUI() { return false; }
+ virtual bool ShouldSupportConfigUI();
virtual void OpenConfigUI() {}
// views::ViewMenuDelegate implementation which overrides the implementation
diff --git a/chrome/browser/chromeos/login/user_controller.cc b/chrome/browser/chromeos/login/user_controller.cc
index 0be3961..d16a720 100644
--- a/chrome/browser/chromeos/login/user_controller.cc
+++ b/chrome/browser/chromeos/login/user_controller.cc
@@ -320,6 +320,10 @@ void UserController::OnRemoveUser() {
delegate_->RemoveUser(this);
}
+bool UserController::IsUserSelected() const {
+ return is_user_selected_;
+}
+
////////////////////////////////////////////////////////////////////////////////
// UserController, private:
//
diff --git a/chrome/browser/chromeos/login/user_controller.h b/chrome/browser/chromeos/login/user_controller.h
index 5981fc8..1b6471e 100644
--- a/chrome/browser/chromeos/login/user_controller.h
+++ b/chrome/browser/chromeos/login/user_controller.h
@@ -122,7 +122,7 @@ class UserController : public views::WidgetDelegate,
// UserView::Delegate implementation:
virtual void OnRemoveUser() OVERRIDE;
- virtual bool IsUserSelected() const OVERRIDE { return is_user_selected_; }
+ virtual bool IsUserSelected() const OVERRIDE;
// UsernameView::Delegate implementation:
virtual void OnLocaleChanged() OVERRIDE;
diff --git a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc
index da27d49..6d152fa 100644
--- a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc
+++ b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc
@@ -42,6 +42,8 @@ WizardAccessibilityHelper::WizardAccessibilityHelper() {
registered_notifications_ = false;
}
+WizardAccessibilityHelper::~WizardAccessibilityHelper() {}
+
void WizardAccessibilityHelper::Init() {
if (IsAccessibilityEnabled()) {
if (!registered_notifications_)
diff --git a/chrome/browser/chromeos/login/wizard_accessibility_helper.h b/chrome/browser/chromeos/login/wizard_accessibility_helper.h
index 537c63c..05ea7b6 100644
--- a/chrome/browser/chromeos/login/wizard_accessibility_helper.h
+++ b/chrome/browser/chromeos/login/wizard_accessibility_helper.h
@@ -51,7 +51,7 @@ class WizardAccessibilityHelper {
WizardAccessibilityHelper();
- virtual ~WizardAccessibilityHelper() {}
+ virtual ~WizardAccessibilityHelper();
void RegisterNotifications();