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

Side by Side Diff: chrome/browser/apps/app_window_browsertest.cc

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/apps/app_browsertest_util.h" 5 #include "chrome/browser/apps/app_browsertest_util.h"
6 #include "chrome/browser/profiles/profile.h" 6 #include "chrome/browser/profiles/profile.h"
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/extensions/application_launch.h" 8 #include "chrome/browser/ui/extensions/application_launch.h"
9 #include "content/public/browser/notification_service.h" 9 #include "content/public/browser/notification_service.h"
10 #include "content/public/test/test_utils.h" 10 #include "content/public/test/test_utils.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 return; 42 return;
43 43
44 waiting_ = true; 44 waiting_ = true;
45 content::RunMessageLoop(); 45 content::RunMessageLoop();
46 } 46 }
47 47
48 // Implements the content::NotificationObserver interface. 48 // Implements the content::NotificationObserver interface.
49 virtual void OnGeometryCacheChanged(const std::string& extension_id, 49 virtual void OnGeometryCacheChanged(const std::string& extension_id,
50 const std::string& window_id, 50 const std::string& window_id,
51 const gfx::Rect& bounds) 51 const gfx::Rect& bounds)
52 OVERRIDE { 52 override {
53 if (extension_id != extension_id_ || window_id != window_id_) 53 if (extension_id != extension_id_ || window_id != window_id_)
54 return; 54 return;
55 55
56 if (bounds_.x() != bounds.x() && 56 if (bounds_.x() != bounds.x() &&
57 bounds_.y() != bounds.y() && 57 bounds_.y() != bounds.y() &&
58 bounds_.width() != bounds.width() && 58 bounds_.width() != bounds.width() &&
59 bounds_.height() != bounds.height()) { 59 bounds_.height() != bounds.height()) {
60 satisfied_ = true; 60 satisfied_ = true;
61 cache_->RemoveObserver(this); 61 cache_->RemoveObserver(this);
62 62
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE); 258 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE);
259 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_; 259 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_;
260 } 260 }
261 #endif 261 #endif
262 262
263 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestVisibleOnAllWorkspaces) { 263 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestVisibleOnAllWorkspaces) {
264 ASSERT_TRUE( 264 ASSERT_TRUE(
265 RunAppWindowAPITestAndWaitForRoundTrip("testVisibleOnAllWorkspaces")) 265 RunAppWindowAPITestAndWaitForRoundTrip("testVisibleOnAllWorkspaces"))
266 << message_; 266 << message_;
267 } 267 }
OLDNEW
« no previous file with comments | « chrome/browser/apps/app_view_browsertest.cc ('k') | chrome/browser/apps/custom_launcher_page_browsertest_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698