OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
9 #include "chrome/browser/ui/browser_command_controller.h" | 9 #include "chrome/browser/ui/browser_command_controller.h" |
10 #include "chrome/browser/ui/browser_commands.h" | 10 #include "chrome/browser/ui/browser_commands.h" |
11 #include "chrome/browser/ui/browser_finder.h" | 11 #include "chrome/browser/ui/browser_finder.h" |
12 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 12 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
13 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h" | 13 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h" |
14 #include "chrome/common/url_constants.h" | 14 #include "chrome/common/url_constants.h" |
15 #include "chrome/test/base/browser_with_test_window_test.h" | 15 #include "chrome/test/base/browser_with_test_window_test.h" |
16 #include "chrome/test/base/testing_profile.h" | 16 #include "chrome/test/base/testing_profile.h" |
17 #include "components/bookmarks/browser/bookmark_model.h" | 17 #include "components/bookmarks/browser/bookmark_model.h" |
18 #include "components/bookmarks/test/bookmark_test_helpers.h" | 18 #include "components/bookmarks/test/bookmark_test_helpers.h" |
19 #include "components/ui/zoom/page_zoom.h" | 19 #include "components/zoom/page_zoom.h" |
20 #include "components/ui/zoom/zoom_controller.h" | 20 #include "components/zoom/zoom_controller.h" |
21 #include "content/public/browser/navigation_controller.h" | 21 #include "content/public/browser/navigation_controller.h" |
22 #include "content/public/browser/navigation_entry.h" | 22 #include "content/public/browser/navigation_entry.h" |
23 #include "content/public/browser/web_contents.h" | 23 #include "content/public/browser/web_contents.h" |
24 #include "content/public/test/test_renderer_host.h" | 24 #include "content/public/test/test_renderer_host.h" |
25 #include "testing/gtest/include/gtest/gtest.h" | 25 #include "testing/gtest/include/gtest/gtest.h" |
26 | 26 |
27 typedef BrowserWithTestWindowTest BrowserCommandsTest; | 27 typedef BrowserWithTestWindowTest BrowserCommandsTest; |
28 | 28 |
29 using bookmarks::BookmarkModel; | 29 using bookmarks::BookmarkModel; |
30 using content::OpenURLParams; | 30 using content::OpenURLParams; |
31 using content::Referrer; | 31 using content::Referrer; |
32 using content::WebContents; | 32 using content::WebContents; |
33 using ui_zoom::ZoomController; | 33 using zoom::ZoomController; |
34 | 34 |
35 // Tests IDC_SELECT_TAB_0, IDC_SELECT_NEXT_TAB, IDC_SELECT_PREVIOUS_TAB and | 35 // Tests IDC_SELECT_TAB_0, IDC_SELECT_NEXT_TAB, IDC_SELECT_PREVIOUS_TAB and |
36 // IDC_SELECT_LAST_TAB. | 36 // IDC_SELECT_LAST_TAB. |
37 TEST_F(BrowserCommandsTest, TabNavigationAccelerators) { | 37 TEST_F(BrowserCommandsTest, TabNavigationAccelerators) { |
38 GURL about_blank(url::kAboutBlankURL); | 38 GURL about_blank(url::kAboutBlankURL); |
39 | 39 |
40 // Create three tabs. | 40 // Create three tabs. |
41 AddTab(browser(), about_blank); | 41 AddTab(browser(), about_blank); |
42 AddTab(browser(), about_blank); | 42 AddTab(browser(), about_blank); |
43 AddTab(browser(), about_blank); | 43 AddTab(browser(), about_blank); |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
251 | 251 |
252 TEST_F(BrowserCommandsTest, OnMaxZoomIn) { | 252 TEST_F(BrowserCommandsTest, OnMaxZoomIn) { |
253 TabStripModel* tab_strip_model = browser()->tab_strip_model(); | 253 TabStripModel* tab_strip_model = browser()->tab_strip_model(); |
254 | 254 |
255 GURL url("http://www.google.com"); | 255 GURL url("http://www.google.com"); |
256 AddTab(browser(), url); | 256 AddTab(browser(), url); |
257 WebContents* first_tab = tab_strip_model->GetWebContentsAt(0); | 257 WebContents* first_tab = tab_strip_model->GetWebContentsAt(0); |
258 | 258 |
259 // Continue to zoom in until zoom percent reaches 500. | 259 // Continue to zoom in until zoom percent reaches 500. |
260 for (int i = 0; i < 9; ++i) { | 260 for (int i = 0; i < 9; ++i) { |
261 ui_zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_IN); | 261 zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_IN); |
262 } | 262 } |
263 | 263 |
264 // TODO(a.sarkar.arun@gmail.com): Figure out why Zoom-In menu item is not | 264 // TODO(a.sarkar.arun@gmail.com): Figure out why Zoom-In menu item is not |
265 // disabled after Max-zoom is reached. Force disable Zoom-In menu item | 265 // disabled after Max-zoom is reached. Force disable Zoom-In menu item |
266 // from the context menu since it breaks try jobs on bots. | 266 // from the context menu since it breaks try jobs on bots. |
267 if (chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS)) | 267 if (chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS)) |
268 chrome::UpdateCommandEnabled(browser(), IDC_ZOOM_PLUS, false); | 268 chrome::UpdateCommandEnabled(browser(), IDC_ZOOM_PLUS, false); |
269 | 269 |
270 ZoomController* zoom_controller = ZoomController::FromWebContents(first_tab); | 270 ZoomController* zoom_controller = ZoomController::FromWebContents(first_tab); |
271 EXPECT_FLOAT_EQ(500.0f, zoom_controller->GetZoomPercent()); | 271 EXPECT_FLOAT_EQ(500.0f, zoom_controller->GetZoomPercent()); |
272 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS)); | 272 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS)); |
273 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL)); | 273 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL)); |
274 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS)); | 274 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS)); |
275 } | 275 } |
276 | 276 |
277 TEST_F(BrowserCommandsTest, OnMaxZoomOut) { | 277 TEST_F(BrowserCommandsTest, OnMaxZoomOut) { |
278 TabStripModel* tab_strip_model = browser()->tab_strip_model(); | 278 TabStripModel* tab_strip_model = browser()->tab_strip_model(); |
279 | 279 |
280 GURL url("http://www.google.com"); | 280 GURL url("http://www.google.com"); |
281 AddTab(browser(), url); | 281 AddTab(browser(), url); |
282 WebContents* first_tab = tab_strip_model->GetWebContentsAt(0); | 282 WebContents* first_tab = tab_strip_model->GetWebContentsAt(0); |
283 | 283 |
284 // Continue to zoom out until zoom percent reaches 25. | 284 // Continue to zoom out until zoom percent reaches 25. |
285 for (int i = 0; i < 7; ++i) { | 285 for (int i = 0; i < 7; ++i) { |
286 ui_zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_OUT); | 286 zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_OUT); |
287 } | 287 } |
288 | 288 |
289 ZoomController* zoom_controller = ZoomController::FromWebContents(first_tab); | 289 ZoomController* zoom_controller = ZoomController::FromWebContents(first_tab); |
290 EXPECT_FLOAT_EQ(25.0f, zoom_controller->GetZoomPercent()); | 290 EXPECT_FLOAT_EQ(25.0f, zoom_controller->GetZoomPercent()); |
291 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS)); | 291 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS)); |
292 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL)); | 292 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL)); |
293 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS)); | 293 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS)); |
294 } | 294 } |
295 | 295 |
296 TEST_F(BrowserCommandsTest, OnZoomReset) { | 296 TEST_F(BrowserCommandsTest, OnZoomReset) { |
297 TabStripModel* tab_strip_model = browser()->tab_strip_model(); | 297 TabStripModel* tab_strip_model = browser()->tab_strip_model(); |
298 | 298 |
299 GURL url("http://www.google.com"); | 299 GURL url("http://www.google.com"); |
300 AddTab(browser(), url); | 300 AddTab(browser(), url); |
301 WebContents* first_tab = tab_strip_model->GetWebContentsAt(0); | 301 WebContents* first_tab = tab_strip_model->GetWebContentsAt(0); |
302 | 302 |
303 // Change the zoom percentage to 100. | 303 // Change the zoom percentage to 100. |
304 ui_zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_RESET); | 304 zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_RESET); |
305 | 305 |
306 ZoomController* zoom_controller = ZoomController::FromWebContents(first_tab); | 306 ZoomController* zoom_controller = ZoomController::FromWebContents(first_tab); |
307 EXPECT_FLOAT_EQ(100.0f, zoom_controller->GetZoomPercent()); | 307 EXPECT_FLOAT_EQ(100.0f, zoom_controller->GetZoomPercent()); |
308 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS)); | 308 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS)); |
309 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL)); | 309 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL)); |
310 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS)); | 310 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS)); |
311 | 311 |
312 // Changing the page scale factor will re-enable IDC_ZOOM_NORMAL | 312 // Changing the page scale factor will re-enable IDC_ZOOM_NORMAL |
313 zoom_controller->SetPageScaleFactorIsOneForTesting(false); | 313 zoom_controller->SetPageScaleFactorIsOneForTesting(false); |
314 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL)); | 314 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL)); |
315 } | 315 } |
316 | 316 |
317 TEST_F(BrowserCommandsTest, OnZoomLevelChanged) { | 317 TEST_F(BrowserCommandsTest, OnZoomLevelChanged) { |
318 TabStripModel* tab_strip_model = browser()->tab_strip_model(); | 318 TabStripModel* tab_strip_model = browser()->tab_strip_model(); |
319 | 319 |
320 GURL url("http://www.google.com"); | 320 GURL url("http://www.google.com"); |
321 AddTab(browser(), url); | 321 AddTab(browser(), url); |
322 WebContents* first_tab = tab_strip_model->GetWebContentsAt(0); | 322 WebContents* first_tab = tab_strip_model->GetWebContentsAt(0); |
323 | 323 |
324 // Changing zoom percentage from default should enable all the zoom | 324 // Changing zoom percentage from default should enable all the zoom |
325 // NSMenuItems. | 325 // NSMenuItems. |
326 ui_zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_IN); | 326 zoom::PageZoom::Zoom(first_tab, content::PAGE_ZOOM_IN); |
327 | 327 |
328 ZoomController* zoom_controller = ZoomController::FromWebContents(first_tab); | 328 ZoomController* zoom_controller = ZoomController::FromWebContents(first_tab); |
329 EXPECT_FLOAT_EQ(110.0f, zoom_controller->GetZoomPercent()); | 329 EXPECT_FLOAT_EQ(110.0f, zoom_controller->GetZoomPercent()); |
330 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS)); | 330 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS)); |
331 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL)); | 331 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL)); |
332 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS)); | 332 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS)); |
333 } | 333 } |
334 | 334 |
335 TEST_F(BrowserCommandsTest, OnZoomChangedForActiveTab) { | 335 TEST_F(BrowserCommandsTest, OnZoomChangedForActiveTab) { |
336 TabStripModel* tab_strip_model = browser()->tab_strip_model(); | 336 TabStripModel* tab_strip_model = browser()->tab_strip_model(); |
(...skipping 10 matching lines...) Expand all Loading... |
347 EXPECT_FLOAT_EQ(100.0f, zoom_controller->GetZoomPercent()); | 347 EXPECT_FLOAT_EQ(100.0f, zoom_controller->GetZoomPercent()); |
348 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS)); | 348 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS)); |
349 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL)); | 349 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL)); |
350 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS)); | 350 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS)); |
351 | 351 |
352 // Add Second tab. | 352 // Add Second tab. |
353 WebContents* second_tab = tab_strip_model->GetWebContentsAt(1); | 353 WebContents* second_tab = tab_strip_model->GetWebContentsAt(1); |
354 | 354 |
355 tab_strip_model->ActivateTabAt(1, true); | 355 tab_strip_model->ActivateTabAt(1, true); |
356 EXPECT_TRUE(tab_strip_model->IsTabSelected(1)); | 356 EXPECT_TRUE(tab_strip_model->IsTabSelected(1)); |
357 ui_zoom::PageZoom::Zoom(second_tab, content::PAGE_ZOOM_OUT); | 357 zoom::PageZoom::Zoom(second_tab, content::PAGE_ZOOM_OUT); |
358 | 358 |
359 zoom_controller = ZoomController::FromWebContents(second_tab); | 359 zoom_controller = ZoomController::FromWebContents(second_tab); |
360 EXPECT_FLOAT_EQ(90.0f, zoom_controller->GetZoomPercent()); | 360 EXPECT_FLOAT_EQ(90.0f, zoom_controller->GetZoomPercent()); |
361 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS)); | 361 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS)); |
362 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL)); | 362 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL)); |
363 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS)); | 363 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS)); |
364 } | 364 } |
365 | 365 |
366 TEST_F(BrowserCommandsTest, OnDefaultZoomLevelChanged) { | 366 TEST_F(BrowserCommandsTest, OnDefaultZoomLevelChanged) { |
367 TabStripModel* tab_strip_model = browser()->tab_strip_model(); | 367 TabStripModel* tab_strip_model = browser()->tab_strip_model(); |
368 GURL url("http://code.google.com"); | 368 GURL url("http://code.google.com"); |
369 AddTab(browser(), url); | 369 AddTab(browser(), url); |
370 WebContents* tab = tab_strip_model->GetWebContentsAt(0); | 370 WebContents* tab = tab_strip_model->GetWebContentsAt(0); |
371 ZoomController* zoom_controller = ZoomController::FromWebContents(tab); | 371 ZoomController* zoom_controller = ZoomController::FromWebContents(tab); |
372 | 372 |
373 // Set the default zoom level to 125. | 373 // Set the default zoom level to 125. |
374 profile()->GetZoomLevelPrefs()->SetDefaultZoomLevelPref( | 374 profile()->GetZoomLevelPrefs()->SetDefaultZoomLevelPref( |
375 content::ZoomFactorToZoomLevel(1.25)); | 375 content::ZoomFactorToZoomLevel(1.25)); |
376 EXPECT_FLOAT_EQ(125.0f, zoom_controller->GetZoomPercent()); | 376 EXPECT_FLOAT_EQ(125.0f, zoom_controller->GetZoomPercent()); |
377 | 377 |
378 // Actual Size from context menu should be disabled now. | 378 // Actual Size from context menu should be disabled now. |
379 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS)); | 379 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS)); |
380 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL)); | 380 EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL)); |
381 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS)); | 381 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS)); |
382 | 382 |
383 // Change the zoom level. | 383 // Change the zoom level. |
384 ui_zoom::PageZoom::Zoom(tab, content::PAGE_ZOOM_IN); | 384 zoom::PageZoom::Zoom(tab, content::PAGE_ZOOM_IN); |
385 | 385 |
386 EXPECT_FLOAT_EQ(150.0f, zoom_controller->GetZoomPercent()); | 386 EXPECT_FLOAT_EQ(150.0f, zoom_controller->GetZoomPercent()); |
387 | 387 |
388 // Tab no longer at default zoom hence actual size should be enabled. | 388 // Tab no longer at default zoom hence actual size should be enabled. |
389 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS)); | 389 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_PLUS)); |
390 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL)); | 390 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_NORMAL)); |
391 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS)); | 391 EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ZOOM_MINUS)); |
392 } | 392 } |
OLD | NEW |