Commit 173269e8 authored by Vadym Doroshenko's avatar Vadym Doroshenko Committed by Commit Bot

Unused function removal in AutofillPopupControllerImpl.

1.set_hide_on_outside_click (didn't have implementation)
2.SetTypesetter.

Bug: 875768
Change-Id: Id9485a040833f96f6e0be3705ab0a3cb7f2cc6cc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824891Reviewed-by: default avatarVasilii Sukhanov <vasilii@chromium.org>
Commit-Queue: Vadym Doroshenko <dvadym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699776}
parent 66d3292d
...@@ -44,7 +44,6 @@ class MockAccessoryView ...@@ -44,7 +44,6 @@ class MockAccessoryView
void(const base::string16&, void(const base::string16&,
const base::string16&, const base::string16&,
base::OnceClosure)); base::OnceClosure));
MOCK_METHOD1(SetTypesetter, void(gfx::Typesetter));
MOCK_METHOD1(GetElidedValueWidthForRow, int(int)); MOCK_METHOD1(GetElidedValueWidthForRow, int(int));
MOCK_METHOD1(GetElidedLabelWidthForRow, int(int)); MOCK_METHOD1(GetElidedLabelWidthForRow, int(int));
......
...@@ -44,7 +44,6 @@ class MockAutofillPopupController ...@@ -44,7 +44,6 @@ class MockAutofillPopupController
return suggestions_; return suggestions_;
} }
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
MOCK_METHOD1(SetTypesetter, void(gfx::Typesetter typesetter));
MOCK_METHOD1(GetElidedValueWidthForRow, int(int row)); MOCK_METHOD1(GetElidedValueWidthForRow, int(int row));
MOCK_METHOD1(GetElidedLabelWidthForRow, int(int row)); MOCK_METHOD1(GetElidedLabelWidthForRow, int(int row));
#endif #endif
......
...@@ -357,10 +357,6 @@ const std::vector<Suggestion> AutofillPopupControllerImpl::GetSuggestions() { ...@@ -357,10 +357,6 @@ const std::vector<Suggestion> AutofillPopupControllerImpl::GetSuggestions() {
} }
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
void AutofillPopupControllerImpl::SetTypesetter(gfx::Typesetter typesetter) {
typesetter_ = typesetter;
}
int AutofillPopupControllerImpl::GetElidedValueWidthForRow(int row) { int AutofillPopupControllerImpl::GetElidedValueWidthForRow(int row) {
return gfx::GetStringWidth(GetElidedValueAt(row), return gfx::GetStringWidth(GetElidedValueAt(row),
layout_model_.GetValueFontListForRow(row), layout_model_.GetValueFontListForRow(row),
......
...@@ -67,9 +67,6 @@ class AutofillPopupControllerImpl : public AutofillPopupController { ...@@ -67,9 +67,6 @@ class AutofillPopupControllerImpl : public AutofillPopupController {
bool HandleKeyPressEvent(const content::NativeWebKeyboardEvent& event); bool HandleKeyPressEvent(const content::NativeWebKeyboardEvent& event);
// Tells the view to capture mouse events. Must be called before |Show()|.
void set_hide_on_outside_click(bool hide_on_outside_click);
protected: protected:
FRIEND_TEST_ALL_PREFIXES(AutofillPopupControllerUnitTest, FRIEND_TEST_ALL_PREFIXES(AutofillPopupControllerUnitTest,
ProperlyResetController); ProperlyResetController);
...@@ -93,7 +90,6 @@ class AutofillPopupControllerImpl : public AutofillPopupController { ...@@ -93,7 +90,6 @@ class AutofillPopupControllerImpl : public AutofillPopupController {
bool IsRTL() const override; bool IsRTL() const override;
const std::vector<Suggestion> GetSuggestions() override; const std::vector<Suggestion> GetSuggestions() override;
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
void SetTypesetter(gfx::Typesetter typesetter) override;
int GetElidedValueWidthForRow(int row) override; int GetElidedValueWidthForRow(int row) override;
int GetElidedLabelWidthForRow(int row) override; int GetElidedLabelWidthForRow(int row) override;
#endif #endif
......
...@@ -56,7 +56,6 @@ class TestAutofillPopupViewDelegate : public AutofillPopupViewDelegate { ...@@ -56,7 +56,6 @@ class TestAutofillPopupViewDelegate : public AutofillPopupViewDelegate {
return suggestions; return suggestions;
} }
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
void SetTypesetter(gfx::Typesetter typesetter) override {}
int GetElidedValueWidthForRow(int row) override { return 0; } int GetElidedValueWidthForRow(int row) override { return 0; }
int GetElidedLabelWidthForRow(int row) override { return 0; } int GetElidedLabelWidthForRow(int row) override { return 0; }
#endif #endif
......
...@@ -63,10 +63,6 @@ class AutofillPopupViewDelegate { ...@@ -63,10 +63,6 @@ class AutofillPopupViewDelegate {
virtual const std::vector<autofill::Suggestion> GetSuggestions() = 0; virtual const std::vector<autofill::Suggestion> GetSuggestions() = 0;
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
// Changes the typesetter used for eliding text. TODO(tapted): Remove this
// when autofill_popup_base_view_cocoa.mm is obsolete.
virtual void SetTypesetter(gfx::Typesetter typesetter) = 0;
// Returns elided values and labels for the given |row|. // Returns elided values and labels for the given |row|.
virtual int GetElidedValueWidthForRow(int row) = 0; virtual int GetElidedValueWidthForRow(int row) = 0;
virtual int GetElidedLabelWidthForRow(int row) = 0; virtual int GetElidedLabelWidthForRow(int row) = 0;
......
...@@ -56,7 +56,6 @@ class MockAutofillPopupController : public autofill::AutofillPopupController { ...@@ -56,7 +56,6 @@ class MockAutofillPopupController : public autofill::AutofillPopupController {
const std::vector<autofill::Suggestion> GetSuggestions() override { const std::vector<autofill::Suggestion> GetSuggestions() override {
return suggestions_; return suggestions_;
} }
MOCK_METHOD1(SetTypesetter, void(gfx::Typesetter typesetter));
MOCK_METHOD1(GetElidedValueWidthForRow, int(int row)); MOCK_METHOD1(GetElidedValueWidthForRow, int(int row));
MOCK_METHOD1(GetElidedLabelWidthForRow, int(int row)); MOCK_METHOD1(GetElidedLabelWidthForRow, int(int row));
......
...@@ -335,9 +335,6 @@ PasswordGenerationPopupControllerImpl::GetSuggestions() { ...@@ -335,9 +335,6 @@ PasswordGenerationPopupControllerImpl::GetSuggestions() {
} }
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
void PasswordGenerationPopupControllerImpl::SetTypesetter(
gfx::Typesetter typesetter) {}
int PasswordGenerationPopupControllerImpl::GetElidedValueWidthForRow(int row) { int PasswordGenerationPopupControllerImpl::GetElidedValueWidthForRow(int row) {
return 0; return 0;
} }
......
...@@ -138,7 +138,6 @@ class PasswordGenerationPopupControllerImpl ...@@ -138,7 +138,6 @@ class PasswordGenerationPopupControllerImpl
bool IsRTL() const override; bool IsRTL() const override;
const std::vector<autofill::Suggestion> GetSuggestions() override; const std::vector<autofill::Suggestion> GetSuggestions() override;
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
void SetTypesetter(gfx::Typesetter typesetter) override;
int GetElidedValueWidthForRow(int row) override; int GetElidedValueWidthForRow(int row) override;
int GetElidedLabelWidthForRow(int row) override; int GetElidedLabelWidthForRow(int row) override;
#endif #endif
......
...@@ -43,7 +43,6 @@ class MockAutofillPopupViewDelegate : public AutofillPopupViewDelegate { ...@@ -43,7 +43,6 @@ class MockAutofillPopupViewDelegate : public AutofillPopupViewDelegate {
MOCK_CONST_METHOD0(IsRTL, bool()); MOCK_CONST_METHOD0(IsRTL, bool());
MOCK_METHOD0(GetSuggestions, const std::vector<autofill::Suggestion>()); MOCK_METHOD0(GetSuggestions, const std::vector<autofill::Suggestion>());
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
MOCK_METHOD1(SetTypesetter, void(gfx::Typesetter typesetter));
MOCK_METHOD1(GetElidedValueWidthForRow, int(int)); MOCK_METHOD1(GetElidedValueWidthForRow, int(int));
MOCK_METHOD1(GetElidedLabelWidthForRow, int(int)); MOCK_METHOD1(GetElidedLabelWidthForRow, int(int));
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment