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

Side by Side Diff: chrome/installer/util/google_update_settings.cc

Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 11 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/gpu/gpu_watchdog_thread.h ('k') | chrome/profile_import/profile_import_thread.h » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/installer/util/google_update_settings.h" 5 #include "chrome/installer/util/google_update_settings.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/thread_restrictions.h" 12 #include "base/threading/thread_restrictions.h"
13 #include "base/time.h" 13 #include "base/time.h"
14 #include "base/win/registry.h" 14 #include "base/win/registry.h"
15 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
16 #include "chrome/installer/util/browser_distribution.h" 16 #include "chrome/installer/util/browser_distribution.h"
17 #include "chrome/installer/util/channel_info.h" 17 #include "chrome/installer/util/channel_info.h"
18 #include "chrome/installer/util/google_update_constants.h" 18 #include "chrome/installer/util/google_update_constants.h"
19 #include "chrome/installer/util/install_util.h" 19 #include "chrome/installer/util/install_util.h"
20 #include "chrome/installer/util/package.h" 20 #include "chrome/installer/util/package.h"
21 #include "chrome/installer/util/package_properties.h" 21 #include "chrome/installer/util/package_properties.h"
22 #include "chrome/installer/util/product.h" 22 #include "chrome/installer/util/product.h"
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 }; 338 };
339 const wchar_t** end = &kBrands[arraysize(kBrands)]; 339 const wchar_t** end = &kBrands[arraysize(kBrands)];
340 const wchar_t** found = std::find(&kBrands[0], end, brand); 340 const wchar_t** found = std::find(&kBrands[0], end, brand);
341 if (found != end) 341 if (found != end)
342 return true; 342 return true;
343 if (StartsWith(brand, L"EUB", true) || StartsWith(brand, L"EUC", true) || 343 if (StartsWith(brand, L"EUB", true) || StartsWith(brand, L"EUC", true) ||
344 StartsWith(brand, L"GGR", true)) 344 StartsWith(brand, L"GGR", true))
345 return true; 345 return true;
346 return false; 346 return false;
347 } 347 }
OLDNEW
« no previous file with comments | « chrome/gpu/gpu_watchdog_thread.h ('k') | chrome/profile_import/profile_import_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698