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

Side by Side Diff: chrome/browser/ui/views/location_bar/star_view_browsertest.cc

Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/views/location_bar/star_view.h" 5 #include "chrome/browser/ui/views/location_bar/star_view.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/ui/tabs/tab_strip_model.h" 10 #include "chrome/browser/ui/tabs/tab_strip_model.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 star_view->OnMouseReleased(released_event); 66 star_view->OnMouseReleased(released_event);
67 EXPECT_FALSE(BookmarkBubbleView::bookmark_bubble()); 67 EXPECT_FALSE(BookmarkBubbleView::bookmark_bubble());
68 } 68 }
69 69
70 #if defined(OS_WIN) 70 #if defined(OS_WIN)
71 71
72 class StarViewTestNoDWM : public InProcessBrowserTest { 72 class StarViewTestNoDWM : public InProcessBrowserTest {
73 public: 73 public:
74 StarViewTestNoDWM() {} 74 StarViewTestNoDWM() {}
75 75
76 virtual void SetUpCommandLine(base::CommandLine* command_line) override { 76 void SetUpCommandLine(base::CommandLine* command_line) override {
77 command_line->AppendSwitch(switches::kDisableDwmComposition); 77 command_line->AppendSwitch(switches::kDisableDwmComposition);
78 } 78 }
79 }; 79 };
80 80
81 BOOL CALLBACK EnumerateChildren(HWND hwnd, LPARAM l_param) { 81 BOOL CALLBACK EnumerateChildren(HWND hwnd, LPARAM l_param) {
82 HWND* child = reinterpret_cast<HWND*>(l_param); 82 HWND* child = reinterpret_cast<HWND*>(l_param);
83 *child = hwnd; 83 *child = hwnd;
84 // The first child window is the plugin, then its children. So stop 84 // The first child window is the plugin, then its children. So stop
85 // enumerating after the first callback. 85 // enumerating after the first callback.
86 return FALSE; 86 return FALSE;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 region_before.left == region_after.left && 156 region_before.left == region_after.left &&
157 region_before.top == region_after.top && 157 region_before.top == region_after.top &&
158 region_before.right == region_after.right && 158 region_before.right == region_after.right &&
159 region_before.bottom == region_after.bottom; 159 region_before.bottom == region_after.bottom;
160 ASSERT_FALSE(rects_equal); 160 ASSERT_FALSE(rects_equal);
161 } 161 }
162 162
163 #endif 163 #endif
164 164
165 } // namespace 165 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698