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

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

Issue 674273002: Cleanup: Remove unneeded chrome/common/pref_names.h includes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 1 month 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 "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/browser/ui/zoom/chrome_zoom_level_prefs.h"
13 #include "chrome/common/pref_names.h"
14 #include "chrome/test/base/in_process_browser_test.h" 13 #include "chrome/test/base/in_process_browser_test.h"
15 #include "chrome/test/base/ui_test_utils.h" 14 #include "chrome/test/base/ui_test_utils.h"
16 #include "content/public/browser/navigation_entry.h" 15 #include "content/public/browser/navigation_entry.h"
17 #include "content/public/browser/render_process_host.h" 16 #include "content/public/browser/render_process_host.h"
18 #include "content/public/browser/render_view_host.h" 17 #include "content/public/browser/render_view_host.h"
19 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_contents.h"
20 #include "content/public/common/page_type.h" 19 #include "content/public/common/page_type.h"
21 #include "content/public/test/browser_test_utils.h" 20 #include "content/public/test/browser_test_utils.h"
22 #include "testing/gmock/include/gmock/gmock.h" 21 #include "testing/gmock/include/gmock/gmock.h"
23 22
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 web_contents->GetController().GetLastCommittedEntry()->GetPageType()); 126 web_contents->GetController().GetLastCommittedEntry()->GetPageType());
128 127
129 double old_zoom_level = zoom_controller->GetZoomLevel(); 128 double old_zoom_level = zoom_controller->GetZoomLevel();
130 double new_zoom_level = old_zoom_level + 0.5; 129 double new_zoom_level = old_zoom_level + 0.5;
131 130
132 // The following attempt to change the zoom level for an error page should 131 // The following attempt to change the zoom level for an error page should
133 // fail. 132 // fail.
134 zoom_controller->SetZoomLevel(new_zoom_level); 133 zoom_controller->SetZoomLevel(new_zoom_level);
135 EXPECT_FLOAT_EQ(old_zoom_level, zoom_controller->GetZoomLevel()); 134 EXPECT_FLOAT_EQ(old_zoom_level, zoom_controller->GetZoomLevel());
136 } 135 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/window_sizer/window_sizer.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