diff options
Diffstat (limited to 'chromium/ui/views/examples')
7 files changed, 9 insertions, 11 deletions
diff --git a/chromium/ui/views/examples/combobox_example.cc b/chromium/ui/views/examples/combobox_example.cc index dc1e8bba76f..79f9c2065ee 100644 --- a/chromium/ui/views/examples/combobox_example.cc +++ b/chromium/ui/views/examples/combobox_example.cc @@ -27,7 +27,7 @@ class ComboboxModelExample : public ui::ComboboxModel { private: // ui::ComboboxModel: int GetItemCount() const override { return 10; } - base::string16 GetItemAt(int index) override { + base::string16 GetItemAt(int index) const override { return base::UTF8ToUTF16(base::StringPrintf("%c item", 'A' + index)); } diff --git a/chromium/ui/views/examples/example_combobox_model.cc b/chromium/ui/views/examples/example_combobox_model.cc index bd3fd9440c9..841d890e2d1 100644 --- a/chromium/ui/views/examples/example_combobox_model.cc +++ b/chromium/ui/views/examples/example_combobox_model.cc @@ -19,7 +19,7 @@ int ExampleComboboxModel::GetItemCount() const { return count_; } -base::string16 ExampleComboboxModel::GetItemAt(int index) { +base::string16 ExampleComboboxModel::GetItemAt(int index) const { return base::ASCIIToUTF16(strings_[index]); } diff --git a/chromium/ui/views/examples/example_combobox_model.h b/chromium/ui/views/examples/example_combobox_model.h index 8f6c389a4ae..79c0d64f9d6 100644 --- a/chromium/ui/views/examples/example_combobox_model.h +++ b/chromium/ui/views/examples/example_combobox_model.h @@ -18,7 +18,7 @@ class ExampleComboboxModel : public ui::ComboboxModel { // ui::ComboboxModel: int GetItemCount() const override; - base::string16 GetItemAt(int index) override; + base::string16 GetItemAt(int index) const override; private: const char* const* const strings_; diff --git a/chromium/ui/views/examples/examples_main_proc.cc b/chromium/ui/views/examples/examples_main_proc.cc index fe417da38a3..ffdbc86fd5d 100644 --- a/chromium/ui/views/examples/examples_main_proc.cc +++ b/chromium/ui/views/examples/examples_main_proc.cc @@ -148,7 +148,6 @@ ExamplesExitCode ExamplesMainProc(bool under_test) { #if BUILDFLAG(ENABLE_DESKTOP_AURA) std::unique_ptr<display::Screen> desktop_screen = base::WrapUnique(views::CreateDesktopScreen()); - display::Screen::SetScreenInstance(desktop_screen.get()); #endif base::RunLoop run_loop(base::RunLoop::Type::kNestableTasksAllowed); diff --git a/chromium/ui/views/examples/examples_skia_gold_pixel_diff.cc b/chromium/ui/views/examples/examples_skia_gold_pixel_diff.cc index ffabc89ae2b..36fb5bdeb44 100644 --- a/chromium/ui/views/examples/examples_skia_gold_pixel_diff.cc +++ b/chromium/ui/views/examples/examples_skia_gold_pixel_diff.cc @@ -39,8 +39,8 @@ ExamplesExitCode ExamplesSkiaGoldPixelDiff::CompareScreenshot( run_loop.Run(); if (screenshot_.IsEmpty()) return ExamplesExitCode::kImageEmpty; - return SkiaGoldPixelDiff::CompareScreenshot(screenshot_name, - *screenshot_.ToSkBitmap()) + return ui::test::SkiaGoldPixelDiff::CompareScreenshot( + screenshot_name, *screenshot_.ToSkBitmap()) ? ExamplesExitCode::kSucceeded : ExamplesExitCode::kFailed; } diff --git a/chromium/ui/views/examples/examples_skia_gold_pixel_diff.h b/chromium/ui/views/examples/examples_skia_gold_pixel_diff.h index 4bb102d97eb..8f04778f736 100644 --- a/chromium/ui/views/examples/examples_skia_gold_pixel_diff.h +++ b/chromium/ui/views/examples/examples_skia_gold_pixel_diff.h @@ -15,7 +15,7 @@ namespace views { namespace examples { -class ExamplesSkiaGoldPixelDiff : public SkiaGoldPixelDiff { +class ExamplesSkiaGoldPixelDiff : public ui::test::SkiaGoldPixelDiff { public: ExamplesSkiaGoldPixelDiff(); ~ExamplesSkiaGoldPixelDiff() override; diff --git a/chromium/ui/views/examples/examples_window.cc b/chromium/ui/views/examples/examples_window.cc index d2cde9bb4e0..c8cb0f2ff9f 100644 --- a/chromium/ui/views/examples/examples_window.cc +++ b/chromium/ui/views/examples/examples_window.cc @@ -95,7 +95,7 @@ class ComboboxModelExampleList : public ui::ComboboxModel { // ui::ComboboxModel: int GetItemCount() const override { return example_list_.size(); } - base::string16 GetItemAt(int index) override { + base::string16 GetItemAt(int index) const override { return base::UTF8ToUTF16(example_list_[index]->example_title()); } @@ -114,6 +114,8 @@ class ExamplesWindowContents : public WidgetDelegateView, public: ExamplesWindowContents(base::OnceClosure on_close, ExampleVector examples) : on_close_(std::move(on_close)) { + SetHasWindowSizeControls(true); + auto combobox_model = std::make_unique<ComboboxModelExampleList>(); combobox_model_ = combobox_model.get(); combobox_model_->SetExamples(std::move(examples)); @@ -161,9 +163,6 @@ class ExamplesWindowContents : public WidgetDelegateView, private: // WidgetDelegateView: - bool CanResize() const override { return true; } - bool CanMaximize() const override { return true; } - bool CanMinimize() const override { return true; } base::string16 GetWindowTitle() const override { return base::ASCIIToUTF16("Views Examples"); } |