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 "base/message_loop/message_loop.h" | 5 #include "base/message_loop/message_loop.h" |
6 #include "base/prefs/pref_service.h" | |
7 #include "chrome/browser/ui/browser.h" | 6 #include "chrome/browser/ui/browser.h" |
8 #include "chrome/browser/ui/browser_finder.h" | 7 #include "chrome/browser/ui/browser_finder.h" |
9 #include "chrome/test/base/chrome_render_view_host_test_harness.h" | 8 #include "chrome/test/base/chrome_render_view_host_test_harness.h" |
10 #include "chrome/test/base/testing_profile.h" | 9 #include "chrome/test/base/testing_profile.h" |
| 10 #include "components/prefs/pref_service.h" |
11 #include "components/ui/zoom/test/zoom_test_utils.h" | 11 #include "components/ui/zoom/test/zoom_test_utils.h" |
12 #include "components/ui/zoom/zoom_controller.h" | 12 #include "components/ui/zoom/zoom_controller.h" |
13 #include "components/ui/zoom/zoom_observer.h" | 13 #include "components/ui/zoom/zoom_observer.h" |
14 #include "content/public/browser/host_zoom_map.h" | 14 #include "content/public/browser/host_zoom_map.h" |
15 #include "content/public/browser/navigation_details.h" | 15 #include "content/public/browser/navigation_details.h" |
16 #include "content/public/common/frame_navigate_params.h" | 16 #include "content/public/common/frame_navigate_params.h" |
17 #include "content/public/test/test_renderer_host.h" | 17 #include "content/public/test/test_renderer_host.h" |
18 #include "content/public/test/test_utils.h" | 18 #include "content/public/test/test_utils.h" |
19 #include "ipc/ipc_message.h" | 19 #include "ipc/ipc_message.h" |
20 #include "testing/gmock/include/gmock/gmock.h" | 20 #include "testing/gmock/include/gmock/gmock.h" |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 ZoomController::ZOOM_MODE_MANUAL, | 124 ZoomController::ZOOM_MODE_MANUAL, |
125 false /* can_show_bubble */); | 125 false /* can_show_bubble */); |
126 { | 126 { |
127 ZoomChangedWatcher zoom_change_watcher2(zoom_controller_.get(), | 127 ZoomChangedWatcher zoom_change_watcher2(zoom_controller_.get(), |
128 zoom_change_data2); | 128 zoom_change_data2); |
129 zoom_controller_->SetZoomLevel(new_zoom_level2); | 129 zoom_controller_->SetZoomLevel(new_zoom_level2); |
130 zoom_change_watcher2.Wait(); | 130 zoom_change_watcher2.Wait(); |
131 } | 131 } |
132 | 132 |
133 } | 133 } |
OLD | NEW |