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

Side by Side Diff: chrome/test/base/chrome_test_launcher.cc

Issue 12226045: Linux/ChromeOS Chromium style checker cleanup, chrome/ edition part 1. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/test/base/chrome_process_util.cc ('k') | chrome/test/base/chrome_test_suite.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 (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 "content/public/test/test_launcher.h" 5 #include "content/public/test/test_launcher.h"
6 6
7 #include <stack> 7 #include <stack>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 #if !defined(USE_AURA) && defined(TOOLKIT_VIEWS) 78 #if !defined(USE_AURA) && defined(TOOLKIT_VIEWS)
79 if (content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) { 79 if (content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
80 linked_ptr<views::AcceleratorHandler> handler( 80 linked_ptr<views::AcceleratorHandler> handler(
81 new views::AcceleratorHandler); 81 new views::AcceleratorHandler);
82 handlers_.push(handler); 82 handlers_.push(handler);
83 run_loop->set_dispatcher(handler.get()); 83 run_loop->set_dispatcher(handler.get());
84 } 84 }
85 #endif 85 #endif
86 } 86 }
87 87
88 virtual void PostRunMessageLoop() { 88 virtual void PostRunMessageLoop() OVERRIDE {
89 #if !defined(USE_AURA) && defined(TOOLKIT_VIEWS) 89 #if !defined(USE_AURA) && defined(TOOLKIT_VIEWS)
90 if (content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) { 90 if (content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
91 DCHECK_EQ(handlers_.empty(), false); 91 DCHECK_EQ(handlers_.empty(), false);
92 handlers_.pop(); 92 handlers_.pop();
93 } 93 }
94 #endif 94 #endif
95 } 95 }
96 96
97 protected: 97 protected:
98 virtual content::ContentMainDelegate* CreateContentMainDelegate() OVERRIDE { 98 virtual content::ContentMainDelegate* CreateContentMainDelegate() OVERRIDE {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 #elif defined(USE_AURA) 133 #elif defined(USE_AURA)
134 // TODO(win_ash): when running interactive_ui_tests for Win Ash, use above. 134 // TODO(win_ash): when running interactive_ui_tests for Win Ash, use above.
135 ui_controls::InstallUIControlsAura(ui_controls::CreateUIControlsAura(NULL)); 135 ui_controls::InstallUIControlsAura(ui_controls::CreateUIControlsAura(NULL));
136 #endif 136 #endif
137 137
138 #endif 138 #endif
139 139
140 ChromeTestLauncherDelegate launcher_delegate; 140 ChromeTestLauncherDelegate launcher_delegate;
141 return content::LaunchTests(&launcher_delegate, argc, argv); 141 return content::LaunchTests(&launcher_delegate, argc, argv);
142 } 142 }
OLDNEW
« no previous file with comments | « chrome/test/base/chrome_process_util.cc ('k') | chrome/test/base/chrome_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698