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

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

Issue 16421004: Use a direct include of strings headers in chrome/installer/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
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 "chrome/installer/util/installation_state.h" 5 #include "chrome/installer/util/installation_state.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/version.h" 9 #include "base/version.h"
10 #include "base/win/registry.h" 10 #include "base/win/registry.h"
11 #include "chrome/installer/util/google_update_constants.h" 11 #include "chrome/installer/util/google_update_constants.h"
12 #include "chrome/installer/util/install_util.h" 12 #include "chrome/installer/util/install_util.h"
13 13
14 namespace installer { 14 namespace installer {
15 15
16 ProductState::ProductState() 16 ProductState::ProductState()
17 : uninstall_command_(CommandLine::NO_PROGRAM), 17 : uninstall_command_(CommandLine::NO_PROGRAM),
18 eula_accepted_(0), 18 eula_accepted_(0),
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 } 268 }
269 269
270 const ProductState* InstallationState::GetProductState( 270 const ProductState* InstallationState::GetProductState(
271 bool system_install, 271 bool system_install,
272 BrowserDistribution::Type type) const { 272 BrowserDistribution::Type type) const {
273 const ProductState* product_state = 273 const ProductState* product_state =
274 GetNonVersionedProductState(system_install, type); 274 GetNonVersionedProductState(system_install, type);
275 return product_state->version_.get() == NULL ? NULL : product_state; 275 return product_state->version_.get() == NULL ? NULL : product_state;
276 } 276 }
277 } // namespace installer 277 } // namespace installer
OLDNEW
« no previous file with comments | « chrome/installer/util/install_util_unittest.cc ('k') | chrome/installer/util/installation_validator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698