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

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

Issue 671653002: Standardize usage of virtual/override/final in chrome/browser/ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 "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"
(...skipping 24 matching lines...) Expand all
35 class ZoomChangedWatcher : public ZoomObserver { 35 class ZoomChangedWatcher : public ZoomObserver {
36 public: 36 public:
37 ZoomChangedWatcher( 37 ZoomChangedWatcher(
38 content::WebContents* web_contents, 38 content::WebContents* web_contents,
39 const ZoomController::ZoomChangedEventData& expected_event_data) 39 const ZoomController::ZoomChangedEventData& expected_event_data)
40 : web_contents_(web_contents), 40 : web_contents_(web_contents),
41 expected_event_data_(expected_event_data), 41 expected_event_data_(expected_event_data),
42 message_loop_runner_(new content::MessageLoopRunner) { 42 message_loop_runner_(new content::MessageLoopRunner) {
43 ZoomController::FromWebContents(web_contents)->AddObserver(this); 43 ZoomController::FromWebContents(web_contents)->AddObserver(this);
44 } 44 }
45 virtual ~ZoomChangedWatcher() {} 45 ~ZoomChangedWatcher() override {}
46 46
47 void Wait() { message_loop_runner_->Run(); } 47 void Wait() { message_loop_runner_->Run(); }
48 48
49 virtual void OnZoomChanged( 49 void OnZoomChanged(
50 const ZoomController::ZoomChangedEventData& event_data) override { 50 const ZoomController::ZoomChangedEventData& event_data) override {
51 if (event_data == expected_event_data_) 51 if (event_data == expected_event_data_)
52 message_loop_runner_->Quit(); 52 message_loop_runner_->Quit();
53 } 53 }
54 54
55 private: 55 private:
56 content::WebContents* web_contents_; 56 content::WebContents* web_contents_;
57 ZoomController::ZoomChangedEventData expected_event_data_; 57 ZoomController::ZoomChangedEventData expected_event_data_;
58 scoped_refptr<content::MessageLoopRunner> message_loop_runner_; 58 scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
59 59
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 web_contents->GetController().GetLastCommittedEntry()->GetPageType()); 127 web_contents->GetController().GetLastCommittedEntry()->GetPageType());
128 128
129 double old_zoom_level = zoom_controller->GetZoomLevel(); 129 double old_zoom_level = zoom_controller->GetZoomLevel();
130 double new_zoom_level = old_zoom_level + 0.5; 130 double new_zoom_level = old_zoom_level + 0.5;
131 131
132 // 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
133 // fail. 133 // fail.
134 zoom_controller->SetZoomLevel(new_zoom_level); 134 zoom_controller->SetZoomLevel(new_zoom_level);
135 EXPECT_FLOAT_EQ(old_zoom_level, zoom_controller->GetZoomLevel()); 135 EXPECT_FLOAT_EQ(old_zoom_level, zoom_controller->GetZoomLevel());
136 } 136 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698