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

Side by Side Diff: chrome/browser/ui/zoom/zoom_controller_browsertest.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 unified diff | Download patch
OLDNEW
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 "components/ui/zoom/zoom_controller.h" 5 #include "components/ui/zoom/zoom_controller.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/prefs/pref_service.h"
9 #include "base/process/kill.h" 8 #include "base/process/kill.h"
10 #include "build/build_config.h" 9 #include "build/build_config.h"
11 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/browser_commands.h" 12 #include "chrome/browser/ui/browser_commands.h"
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" 13 #include "chrome/browser/ui/tabs/tab_strip_model.h"
15 #include "chrome/browser/ui/webui/signin/login_ui_test_utils.h" 14 #include "chrome/browser/ui/webui/signin/login_ui_test_utils.h"
16 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h" 15 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
17 #include "chrome/common/url_constants.h" 16 #include "chrome/common/url_constants.h"
18 #include "chrome/test/base/in_process_browser_test.h" 17 #include "chrome/test/base/in_process_browser_test.h"
19 #include "chrome/test/base/ui_test_utils.h" 18 #include "chrome/test/base/ui_test_utils.h"
19 #include "components/prefs/pref_service.h"
20 #include "components/signin/core/common/profile_management_switches.h" 20 #include "components/signin/core/common/profile_management_switches.h"
21 #include "content/public/browser/host_zoom_map.h" 21 #include "content/public/browser/host_zoom_map.h"
22 #include "content/public/browser/navigation_entry.h" 22 #include "content/public/browser/navigation_entry.h"
23 #include "content/public/browser/render_process_host.h" 23 #include "content/public/browser/render_process_host.h"
24 #include "content/public/browser/render_view_host.h" 24 #include "content/public/browser/render_view_host.h"
25 #include "content/public/browser/web_contents.h" 25 #include "content/public/browser/web_contents.h"
26 #include "content/public/common/page_type.h" 26 #include "content/public/common/page_type.h"
27 #include "content/public/test/browser_test_utils.h" 27 #include "content/public/test/browser_test_utils.h"
28 #include "testing/gmock/include/gmock/gmock.h" 28 #include "testing/gmock/include/gmock/gmock.h"
29 29
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 web_contents, 322 web_contents,
323 old_zoom_level, 323 old_zoom_level,
324 new_zoom_level, 324 new_zoom_level,
325 ZoomController::ZOOM_MODE_DEFAULT, 325 ZoomController::ZOOM_MODE_DEFAULT,
326 true); // We have a non-empty host, so this will be 'true'. 326 true); // We have a non-empty host, so this will be 'true'.
327 ZoomChangedWatcher zoom_change_watcher(web_contents, zoom_change_data); 327 ZoomChangedWatcher zoom_change_watcher(web_contents, zoom_change_data);
328 zoom_controller->SetZoomLevel(new_zoom_level); 328 zoom_controller->SetZoomLevel(new_zoom_level);
329 zoom_change_watcher.Wait(); 329 zoom_change_watcher.Wait();
330 } 330 }
331 #endif // !defined(OS_CHROMEOS) 331 #endif // !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc ('k') | chrome/browser/ui/zoom/zoom_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698