chrome/installer/util/installer_state.cc - Issue 6153003: Refactor install.cc into the work item parts and the non-work item parts.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 6153003: Refactor install.cc into the work item parts and the non-work item parts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: PostMergeTest3AddingMissingFile 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/installer/util/installer_state.h ('k') | chrome/installer/util/work_item_list.h » ('j') | no next file with comments »

OLD	NEW
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/installer_state.h"	5 #include "chrome/installer/util/installer_state.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "chrome/installer/util/installation_state.h"	8 #include "chrome/installer/util/installation_state.h"

9 #include "chrome/installer/util/master_preferences.h"	9 #include "chrome/installer/util/master_preferences.h"

10 #include "chrome/installer/util/master_preferences_constants.h"	10 #include "chrome/installer/util/master_preferences_constants.h"

(...skipping 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
78 // is being installed. In all other cases, Chrome's is used.	78 // is being installed. In all other cases, Chrome's is used.

79 operand = BrowserDistribution::GetSpecificDistribution(	79 operand = BrowserDistribution::GetSpecificDistribution(

80 prefs.install_chrome() ?	80 prefs.install_chrome() ?

81 BrowserDistribution::CHROME_BROWSER :	81 BrowserDistribution::CHROME_BROWSER :

82 BrowserDistribution::CHROME_FRAME,	82 BrowserDistribution::CHROME_FRAME,

83 prefs);	83 prefs);

84 operation_ = MULTI_INSTALL;	84 operation_ = MULTI_INSTALL;

85 }	85 }

86	86

87 if (operand != NULL) {	87 if (operand != NULL) {

88 install_operand_ = operand->GetType();

89 state_key_ = operand->GetStateKey();	88 state_key_ = operand->GetStateKey();

90 }	89 }

91 }	90 }

92	91

93 } // namespace installer	92 } // namespace installer

OLD	NEW