Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(855)

Unified Diff: ui/views/corewm/tooltip_controller_unittest.cc

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4
Patch Set: and another rebase Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/corewm/tooltip_controller.cc ('k') | ui/views/corewm/tooltip_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/corewm/tooltip_controller_unittest.cc
diff --git a/ui/views/corewm/tooltip_controller_unittest.cc b/ui/views/corewm/tooltip_controller_unittest.cc
index ca663228077d6d04681ba6bebc9b36f8fc821a08..4fc0bc8e42802804a6f893ebcd9388a913aa2fa6 100644
--- a/ui/views/corewm/tooltip_controller_unittest.cc
+++ b/ui/views/corewm/tooltip_controller_unittest.cc
@@ -19,7 +19,6 @@
#include "ui/gfx/font.h"
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/screen.h"
-#include "ui/gfx/screen_type_delegate.h"
#include "ui/gfx/text_elider.h"
#include "ui/views/corewm/tooltip_aura.h"
#include "ui/views/corewm/tooltip_controller_test_helper.h"
@@ -427,14 +426,13 @@ class TooltipControllerCaptureTest : public TooltipControllerTest {
&screen_position_client_);
#if !defined(OS_CHROMEOS)
desktop_screen_.reset(CreateDesktopScreen());
- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE,
- desktop_screen_.get());
+ gfx::Screen::SetScreenInstance(desktop_screen_.get());
#endif
}
void TearDown() override {
#if !defined(OS_CHROMEOS)
- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen());
+ gfx::Screen::SetScreenInstance(test_screen());
desktop_screen_.reset();
#endif
aura::client::SetScreenPositionClient(GetRootWindow(), NULL);
@@ -534,8 +532,7 @@ class TestTooltip : public Tooltip {
const base::string16& tooltip_text() const { return tooltip_text_; }
// Tooltip:
- int GetMaxWidth(const gfx::Point& location,
- aura::Window* context) const override {
+ int GetMaxWidth(const gfx::Point& location) const override {
return 100;
}
void SetText(aura::Window* window,
« no previous file with comments | « ui/views/corewm/tooltip_controller.cc ('k') | ui/views/corewm/tooltip_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698