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

Side by Side Diff: chrome/browser/component_updater/component_updater_configurator.cc

Issue 8139033: Provide extra info for ARM on ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use none/none for non x86 until right arm define is tested Created 9 years, 2 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 | « no previous file | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/component_updater/component_updater_service.h" 5 #include "chrome/browser/component_updater/component_updater_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 "os=linux&arch=x64"; 55 "os=linux&arch=x64";
56 #elif defined(__i386__) 56 #elif defined(__i386__)
57 "os=linux&arch=x86"; 57 "os=linux&arch=x86";
58 #else 58 #else
59 #error "unknown linux architecture" 59 #error "unknown linux architecture"
60 #endif 60 #endif
61 #elif defined(OS_CHROMEOS) 61 #elif defined(OS_CHROMEOS)
62 #if defined(__i386__) 62 #if defined(__i386__)
63 "os=cros&arch=x86"; 63 "os=cros&arch=x86";
64 #else 64 #else
65 #error "unknown chromeOs architecture" 65 // TODO(cpu): Fix this for ARM.
66 "os=none&arch=none";
66 #endif 67 #endif
67 #else 68 #else
68 #error "unknown os or architecture" 69 #error "unknown os or architecture"
69 #endif 70 #endif
70 71
71 } // namespace 72 } // namespace
72 73
73 class ChromeConfigurator : public ComponentUpdateService::Configurator { 74 class ChromeConfigurator : public ComponentUpdateService::Configurator {
74 public: 75 public:
75 ChromeConfigurator(const CommandLine* cmdline, 76 ChromeConfigurator(const CommandLine* cmdline,
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 default: 166 default:
166 NOTREACHED(); 167 NOTREACHED();
167 break; 168 break;
168 } 169 }
169 } 170 }
170 171
171 ComponentUpdateService::Configurator* MakeChromeComponentUpdaterConfigurator( 172 ComponentUpdateService::Configurator* MakeChromeComponentUpdaterConfigurator(
172 const CommandLine* cmdline, net::URLRequestContextGetter* context_getter) { 173 const CommandLine* cmdline, net::URLRequestContextGetter* context_getter) {
173 return new ChromeConfigurator(cmdline, context_getter); 174 return new ChromeConfigurator(cmdline, context_getter);
174 } 175 }
175
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698