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

Side by Side Diff: headless/public/headless_browser.cc

Issue 2778983002: Fix browser tests on Mac (Closed)
Patch Set: nit change on #if defined on DefaultSizes test Created 3 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "headless/public/headless_browser.h" 5 #include "headless/public/headless_browser.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "content/public/common/user_agent.h" 9 #include "content/public/common/user_agent.h"
10 #include "headless/public/version.h" 10 #include "headless/public/version.h"
(...skipping 12 matching lines...) Expand all
23 return std::string(kProductName) + "/" + PRODUCT_VERSION; 23 return std::string(kProductName) + "/" + PRODUCT_VERSION;
24 } 24 }
25 } // namespace 25 } // namespace
26 26
27 Options::Options(int argc, const char** argv) 27 Options::Options(int argc, const char** argv)
28 : argc(argc), 28 : argc(argc),
29 argv(argv), 29 argv(argv),
30 message_pump(nullptr), 30 message_pump(nullptr),
31 single_process_mode(false), 31 single_process_mode(false),
32 disable_sandbox(false), 32 disable_sandbox(false),
33 #if !defined(OS_MACOSX)
33 gl_implementation("osmesa"), 34 gl_implementation("osmesa"),
35 #else
36 gl_implementation("any"),
37 #endif
34 product_name_and_version(GetProductNameAndVersion()), 38 product_name_and_version(GetProductNameAndVersion()),
35 user_agent(content::BuildUserAgentFromProduct(product_name_and_version)), 39 user_agent(content::BuildUserAgentFromProduct(product_name_and_version)),
36 window_size(kDefaultWindowSize), 40 window_size(kDefaultWindowSize),
37 incognito_mode(true), 41 incognito_mode(true),
38 enable_crash_reporter(false) {} 42 enable_crash_reporter(false) {
43 }
39 44
40 Options::Options(Options&& options) = default; 45 Options::Options(Options&& options) = default;
41 46
42 Options::~Options() {} 47 Options::~Options() {}
43 48
44 Options& Options::operator=(Options&& options) = default; 49 Options& Options::operator=(Options&& options) = default;
45 50
46 Builder::Builder(int argc, const char** argv) : options_(argc, argv) {} 51 Builder::Builder(int argc, const char** argv) : options_(argc, argv) {}
47 52
48 Builder::Builder() : options_(0, nullptr) {} 53 Builder::Builder() : options_(0, nullptr) {}
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 Builder& Builder::SetCrashDumpsDir(const base::FilePath& dir) { 134 Builder& Builder::SetCrashDumpsDir(const base::FilePath& dir) {
130 options_.crash_dumps_dir = dir; 135 options_.crash_dumps_dir = dir;
131 return *this; 136 return *this;
132 } 137 }
133 138
134 Options Builder::Build() { 139 Options Builder::Build() {
135 return std::move(options_); 140 return std::move(options_);
136 } 141 }
137 142
138 } // namespace headless 143 } // namespace headless
OLDNEW
« no previous file with comments | « headless/lib/headless_web_contents_browsertest.cc ('k') | headless/test/headless_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698