OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/browser/ui/zoom/zoom_controller.h" | 5 #include "chrome/browser/ui/zoom/zoom_controller.h" |
6 | 6 |
7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
8 #include "base/process/kill.h" | 8 #include "base/process/kill.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
11 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 11 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 12 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h" |
12 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
13 #include "chrome/test/base/in_process_browser_test.h" | 14 #include "chrome/test/base/in_process_browser_test.h" |
14 #include "chrome/test/base/ui_test_utils.h" | 15 #include "chrome/test/base/ui_test_utils.h" |
15 #include "content/public/browser/navigation_entry.h" | 16 #include "content/public/browser/navigation_entry.h" |
16 #include "content/public/browser/render_process_host.h" | 17 #include "content/public/browser/render_process_host.h" |
17 #include "content/public/browser/render_view_host.h" | 18 #include "content/public/browser/render_view_host.h" |
18 #include "content/public/browser/web_contents.h" | 19 #include "content/public/browser/web_contents.h" |
19 #include "content/public/common/page_type.h" | 20 #include "content/public/common/page_type.h" |
20 #include "content/public/test/browser_test_utils.h" | 21 #include "content/public/test/browser_test_utils.h" |
21 #include "testing/gmock/include/gmock/gmock.h" | 22 #include "testing/gmock/include/gmock/gmock.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 // zoom level will change the zoom level for this web_contents. | 101 // zoom level will change the zoom level for this web_contents. |
101 ZoomController::ZoomChangedEventData zoom_change_data( | 102 ZoomController::ZoomChangedEventData zoom_change_data( |
102 web_contents, | 103 web_contents, |
103 new_default_zoom_level, | 104 new_default_zoom_level, |
104 new_default_zoom_level, | 105 new_default_zoom_level, |
105 ZoomController::ZOOM_MODE_DEFAULT, | 106 ZoomController::ZOOM_MODE_DEFAULT, |
106 true); | 107 true); |
107 ZoomChangedWatcher zoom_change_watcher(web_contents, zoom_change_data); | 108 ZoomChangedWatcher zoom_change_watcher(web_contents, zoom_change_data); |
108 // TODO(wjmaclean): Convert this to call partition-specific zoom level prefs | 109 // TODO(wjmaclean): Convert this to call partition-specific zoom level prefs |
109 // when they become available. | 110 // when they become available. |
110 browser()->profile()->GetPrefs()->SetDouble(prefs::kDefaultZoomLevel, | 111 browser()->profile()->GetZoomLevelPrefs()->SetDefaultZoomLevelPref( |
111 new_default_zoom_level); | 112 new_default_zoom_level); |
112 // Because this test relies on a round-trip IPC to/from the renderer process, | 113 // Because this test relies on a round-trip IPC to/from the renderer process, |
113 // we need to wait for it to propagate. | 114 // we need to wait for it to propagate. |
114 zoom_change_watcher.Wait(); | 115 zoom_change_watcher.Wait(); |
115 } | 116 } |
116 | 117 |
117 IN_PROC_BROWSER_TEST_F(ZoomControllerBrowserTest, ErrorPagesDoNotZoom) { | 118 IN_PROC_BROWSER_TEST_F(ZoomControllerBrowserTest, ErrorPagesDoNotZoom) { |
118 ui_test_utils::NavigateToURL(browser(), GURL("http://kjfhkjsdf.com")); | 119 ui_test_utils::NavigateToURL(browser(), GURL("http://kjfhkjsdf.com")); |
119 content::WebContents* web_contents = | 120 content::WebContents* web_contents = |
120 browser()->tab_strip_model()->GetActiveWebContents(); | 121 browser()->tab_strip_model()->GetActiveWebContents(); |
121 | 122 |
122 ZoomController* zoom_controller = | 123 ZoomController* zoom_controller = |
123 ZoomController::FromWebContents(web_contents); | 124 ZoomController::FromWebContents(web_contents); |
124 EXPECT_EQ( | 125 EXPECT_EQ( |
125 content::PAGE_TYPE_ERROR, | 126 content::PAGE_TYPE_ERROR, |
126 web_contents->GetController().GetLastCommittedEntry()->GetPageType()); | 127 web_contents->GetController().GetLastCommittedEntry()->GetPageType()); |
127 | 128 |
128 double old_zoom_level = zoom_controller->GetZoomLevel(); | 129 double old_zoom_level = zoom_controller->GetZoomLevel(); |
129 double new_zoom_level = old_zoom_level + 0.5; | 130 double new_zoom_level = old_zoom_level + 0.5; |
130 | 131 |
131 // The following attempt to change the zoom level for an error page should | 132 // The following attempt to change the zoom level for an error page should |
132 // fail. | 133 // fail. |
133 zoom_controller->SetZoomLevel(new_zoom_level); | 134 zoom_controller->SetZoomLevel(new_zoom_level); |
134 EXPECT_FLOAT_EQ(old_zoom_level, zoom_controller->GetZoomLevel()); | 135 EXPECT_FLOAT_EQ(old_zoom_level, zoom_controller->GetZoomLevel()); |
135 } | 136 } |
OLD | NEW |