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

Side by Side Diff: ui/gl/gl_implementation.cc

Issue 1223153003: Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: windows Created 5 years, 5 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
« no previous file with comments | « ui/gl/gl_gl_api_implementation.cc ('k') | ui/message_center/cocoa/notification_controller.mm » ('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 "ui/gl/gl_implementation.h" 5 #include "ui/gl/gl_implementation.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/at_exit.h" 10 #include "base/at_exit.h"
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 base::SplitString(extensions, ' ', &extension_vec); 166 base::SplitString(extensions, ' ', &extension_vec);
167 167
168 auto is_disabled = [&disabled_extensions](const std::string& ext) { 168 auto is_disabled = [&disabled_extensions](const std::string& ext) {
169 return std::find(disabled_extensions.begin(), disabled_extensions.end(), 169 return std::find(disabled_extensions.begin(), disabled_extensions.end(),
170 ext) != disabled_extensions.end(); 170 ext) != disabled_extensions.end();
171 }; 171 };
172 extension_vec.erase( 172 extension_vec.erase(
173 std::remove_if(extension_vec.begin(), extension_vec.end(), is_disabled), 173 std::remove_if(extension_vec.begin(), extension_vec.end(), is_disabled),
174 extension_vec.end()); 174 extension_vec.end());
175 175
176 return JoinString(extension_vec, " "); 176 return base::JoinString(extension_vec, " ");
177 } 177 }
178 178
179 DisableNullDrawGLBindings::DisableNullDrawGLBindings() { 179 DisableNullDrawGLBindings::DisableNullDrawGLBindings() {
180 initial_enabled_ = SetNullDrawGLBindingsEnabledGL(false); 180 initial_enabled_ = SetNullDrawGLBindingsEnabledGL(false);
181 } 181 }
182 182
183 DisableNullDrawGLBindings::~DisableNullDrawGLBindings() { 183 DisableNullDrawGLBindings::~DisableNullDrawGLBindings() {
184 SetNullDrawGLBindingsEnabledGL(initial_enabled_); 184 SetNullDrawGLBindingsEnabledGL(initial_enabled_);
185 } 185 }
186 186
187 GLWindowSystemBindingInfo::GLWindowSystemBindingInfo() 187 GLWindowSystemBindingInfo::GLWindowSystemBindingInfo()
188 : direct_rendering(true) {} 188 : direct_rendering(true) {}
189 189
190 } // namespace gfx 190 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl_gl_api_implementation.cc ('k') | ui/message_center/cocoa/notification_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698