Commit 01a5a40f authored by manuk's avatar manuk Committed by Commit Bot

Omnibox: increase omnibox minimum width

Omnibox width was 10 characters (plus some extra for page actions and location bar bubbles), and is now 20 characters.

Bug: 849784
Change-Id: Iaacab5244b5f1c21156151f49e0405e844f09451
Reviewed-on: https://chromium-review.googlesource.com/1135147Reviewed-by: default avatarJonathon Kereliuk <kereliuk@chromium.org>
Reviewed-by: default avatarAndrey Kosyakov <caseq@chromium.org>
Reviewed-by: default avatarBernhard Bauer <bauerb@chromium.org>
Reviewed-by: default avatarTommy Li <tommycli@chromium.org>
Reviewed-by: default avatarJustin Donnelly <jdonnelly@chromium.org>
Commit-Queue: manuk hovanesian <manukh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578623}
parent 0ef56662
...@@ -122,10 +122,10 @@ class DevToolsManagerDelegateTest : public InProcessBrowserTest { ...@@ -122,10 +122,10 @@ class DevToolsManagerDelegateTest : public InProcessBrowserTest {
}; };
IN_PROC_BROWSER_TEST_F(DevToolsManagerDelegateTest, NormalWindowChangeBounds) { IN_PROC_BROWSER_TEST_F(DevToolsManagerDelegateTest, NormalWindowChangeBounds) {
browser()->window()->SetBounds(gfx::Rect(100, 100, 500, 600)); browser()->window()->SetBounds(gfx::Rect(100, 100, 600, 600));
CheckWindowBounds(gfx::Rect(100, 100, 500, 600)); CheckWindowBounds(gfx::Rect(100, 100, 600, 600));
UpdateBounds(); UpdateBounds();
CheckWindowBounds(gfx::Rect(200, 100, 500, 400)); CheckWindowBounds(gfx::Rect(200, 100, 600, 400));
} }
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
typedef InProcessBrowserTest PreservedWindowPlacement; typedef InProcessBrowserTest PreservedWindowPlacement;
IN_PROC_BROWSER_TEST_F(PreservedWindowPlacement, PRE_Test) { IN_PROC_BROWSER_TEST_F(PreservedWindowPlacement, PRE_Test) {
browser()->window()->SetBounds(gfx::Rect(20, 30, 500, 600)); browser()->window()->SetBounds(gfx::Rect(20, 30, 600, 600));
} }
// Fails on Chrome OS as the browser thinks it is restarting after a crash, see // Fails on Chrome OS as the browser thinks it is restarting after a crash, see
...@@ -40,7 +40,7 @@ IN_PROC_BROWSER_TEST_F(PreservedWindowPlacement, PRE_Test) { ...@@ -40,7 +40,7 @@ IN_PROC_BROWSER_TEST_F(PreservedWindowPlacement, PRE_Test) {
#endif #endif
IN_PROC_BROWSER_TEST_F(PreservedWindowPlacement, MAYBE_Test) { IN_PROC_BROWSER_TEST_F(PreservedWindowPlacement, MAYBE_Test) {
gfx::Rect bounds = browser()->window()->GetBounds(); gfx::Rect bounds = browser()->window()->GetBounds();
gfx::Rect expected_bounds(gfx::Rect(20, 30, 500, 600)); gfx::Rect expected_bounds(gfx::Rect(20, 30, 600, 600));
ASSERT_EQ(expected_bounds.ToString(), bounds.ToString()); ASSERT_EQ(expected_bounds.ToString(), bounds.ToString());
} }
......
...@@ -330,7 +330,7 @@ bool OmniboxViewViews::IsImeComposing() const { ...@@ -330,7 +330,7 @@ bool OmniboxViewViews::IsImeComposing() const {
} }
gfx::Size OmniboxViewViews::GetMinimumSize() const { gfx::Size OmniboxViewViews::GetMinimumSize() const {
const int kMinCharacters = 10; const int kMinCharacters = 20;
return gfx::Size( return gfx::Size(
GetFontList().GetExpectedTextWidth(kMinCharacters) + GetInsets().width(), GetFontList().GetExpectedTextWidth(kMinCharacters) + GetInsets().width(),
GetPreferredSize().height()); GetPreferredSize().height());
......
...@@ -974,8 +974,8 @@ class ChromeDriverTest(ChromeDriverBaseTestWithWebServer): ...@@ -974,8 +974,8 @@ class ChromeDriverTest(ChromeDriverBaseTestWithWebServer):
self._driver.SetWindowSize(size[0], size[1]) self._driver.SetWindowSize(size[0], size[1])
self.assertEquals(size, self._driver.GetWindowSize()) self.assertEquals(size, self._driver.GetWindowSize())
self._driver.SetWindowSize(600, 400) self._driver.SetWindowSize(640, 400)
self.assertEquals([600, 400], self._driver.GetWindowSize()) self.assertEquals([640, 400], self._driver.GetWindowSize())
def testWindowMaximize(self): def testWindowMaximize(self):
self._driver.SetWindowPosition(100, 200) self._driver.SetWindowPosition(100, 200)
...@@ -986,19 +986,19 @@ class ChromeDriverTest(ChromeDriverBaseTestWithWebServer): ...@@ -986,19 +986,19 @@ class ChromeDriverTest(ChromeDriverBaseTestWithWebServer):
self.assertNotEqual([500, 300], self._driver.GetWindowSize()) self.assertNotEqual([500, 300], self._driver.GetWindowSize())
# Set size first so that the window isn't moved offscreen. # Set size first so that the window isn't moved offscreen.
# See https://bugs.chromium.org/p/chromedriver/issues/detail?id=297. # See https://bugs.chromium.org/p/chromedriver/issues/detail?id=297.
self._driver.SetWindowSize(600, 400) self._driver.SetWindowSize(640, 400)
self._driver.SetWindowPosition(100, 200) self._driver.SetWindowPosition(100, 200)
self.assertEquals([100, 200], self._driver.GetWindowPosition()) self.assertEquals([100, 200], self._driver.GetWindowPosition())
self.assertEquals([600, 400], self._driver.GetWindowSize()) self.assertEquals([640, 400], self._driver.GetWindowSize())
def testWindowMinimize(self): def testWindowMinimize(self):
handle_prefix = "CDwindow-" handle_prefix = "CDwindow-"
handle = self._driver.GetCurrentWindowHandle() handle = self._driver.GetCurrentWindowHandle()
target = handle[len(handle_prefix):] target = handle[len(handle_prefix):]
self._driver.SetWindowPosition(100, 200) self._driver.SetWindowPosition(100, 200)
self._driver.SetWindowSize(600, 400) self._driver.SetWindowSize(640, 400)
rect = self._driver.MinimizeWindow() rect = self._driver.MinimizeWindow()
expected_rect = {u'y': 200, u'width': 600, u'height': 400, u'x': 100} expected_rect = {u'y': 200, u'width': 640, u'height': 400, u'x': 100}
#check it returned the correct rect #check it returned the correct rect
for key in expected_rect.keys(): for key in expected_rect.keys():
......
...@@ -6,7 +6,7 @@ var pass = chrome.test.callbackPass; ...@@ -6,7 +6,7 @@ var pass = chrome.test.callbackPass;
var finalTop = 400; var finalTop = 400;
var finalLeft = 10; var finalLeft = 10;
var finalWidth = 580; var finalWidth = 640;
var finalHeight = 401; var finalHeight = 401;
var chromeWindow = null; var chromeWindow = null;
......
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