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

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

Issue 1053663003: Cleanup: Remove unused variables in chrome/ found by Scythe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « chrome/browser/ui/webui/policy_ui.cc ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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"
(...skipping 24 matching lines...) Expand all
35 lhs.new_zoom_level == rhs.new_zoom_level && 35 lhs.new_zoom_level == rhs.new_zoom_level &&
36 lhs.zoom_mode == rhs.zoom_mode && 36 lhs.zoom_mode == rhs.zoom_mode &&
37 lhs.can_show_bubble == rhs.can_show_bubble; 37 lhs.can_show_bubble == rhs.can_show_bubble;
38 } 38 }
39 39
40 class ZoomChangedWatcher : public ZoomObserver { 40 class ZoomChangedWatcher : public ZoomObserver {
41 public: 41 public:
42 ZoomChangedWatcher( 42 ZoomChangedWatcher(
43 content::WebContents* web_contents, 43 content::WebContents* web_contents,
44 const ZoomController::ZoomChangedEventData& expected_event_data) 44 const ZoomController::ZoomChangedEventData& expected_event_data)
45 : web_contents_(web_contents), 45 : expected_event_data_(expected_event_data),
46 expected_event_data_(expected_event_data),
47 message_loop_runner_(new content::MessageLoopRunner) { 46 message_loop_runner_(new content::MessageLoopRunner) {
48 ZoomController::FromWebContents(web_contents)->AddObserver(this); 47 ZoomController::FromWebContents(web_contents)->AddObserver(this);
49 } 48 }
50 ~ZoomChangedWatcher() override {} 49 ~ZoomChangedWatcher() override {}
51 50
52 void Wait() { message_loop_runner_->Run(); } 51 void Wait() { message_loop_runner_->Run(); }
53 52
54 void OnZoomChanged( 53 void OnZoomChanged(
55 const ZoomController::ZoomChangedEventData& event_data) override { 54 const ZoomController::ZoomChangedEventData& event_data) override {
56 if (event_data == expected_event_data_) 55 if (event_data == expected_event_data_)
57 message_loop_runner_->Quit(); 56 message_loop_runner_->Quit();
58 } 57 }
59 58
60 private: 59 private:
61 content::WebContents* web_contents_;
62 ZoomController::ZoomChangedEventData expected_event_data_; 60 ZoomController::ZoomChangedEventData expected_event_data_;
63 scoped_refptr<content::MessageLoopRunner> message_loop_runner_; 61 scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
64 62
65 DISALLOW_COPY_AND_ASSIGN(ZoomChangedWatcher); 63 DISALLOW_COPY_AND_ASSIGN(ZoomChangedWatcher);
66 }; 64 };
67 65
68 class ZoomControllerBrowserTest : public InProcessBrowserTest { 66 class ZoomControllerBrowserTest : public InProcessBrowserTest {
69 public: 67 public:
70 ZoomControllerBrowserTest() {} 68 ZoomControllerBrowserTest() {}
71 ~ZoomControllerBrowserTest() override {} 69 ~ZoomControllerBrowserTest() override {}
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 web_contents, 334 web_contents,
337 old_zoom_level, 335 old_zoom_level,
338 new_zoom_level, 336 new_zoom_level,
339 ZoomController::ZOOM_MODE_DEFAULT, 337 ZoomController::ZOOM_MODE_DEFAULT,
340 true); // We have a non-empty host, so this will be 'true'. 338 true); // We have a non-empty host, so this will be 'true'.
341 ZoomChangedWatcher zoom_change_watcher(web_contents, zoom_change_data); 339 ZoomChangedWatcher zoom_change_watcher(web_contents, zoom_change_data);
342 zoom_controller->SetZoomLevel(new_zoom_level); 340 zoom_controller->SetZoomLevel(new_zoom_level);
343 zoom_change_watcher.Wait(); 341 zoom_change_watcher.Wait();
344 } 342 }
345 #endif // !defined(OS_CHROMEOS) 343 #endif // !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/policy_ui.cc ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698