chrome/browser/sync/glue/theme_model_associator.cc - Issue 7624009: Original patch by rlarocque@chromium.org at http://codereview.chromium.org/7633077/

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/browser/sync/glue/theme_model_associator.cc

Issue 7624009: Original patch by rlarocque@chromium.org at http://codereview.chromium.org/7633077/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix windows build pt5 Created 9 years, 4 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/browser/sync/glue/theme_change_processor.cc ('k') | chrome/browser/sync/glue/typed_url_change_processor.cc » ('j') | no next file with comments »

OLD	NEW
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/sync/glue/theme_model_associator.h"	5 #include "chrome/browser/sync/glue/theme_model_associator.h"

6	6

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

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

9 #include "base/tracked.h"	9 #include "base/tracked.h"

10 #include "base/utf_string_conversions.h"	10 #include "base/utf_string_conversions.h"

11 #include "chrome/browser/sync/api/sync_error.h"	11 #include "chrome/browser/sync/api/sync_error.h"

12 #include "chrome/browser/sync/engine/syncapi.h"

13 #include "chrome/browser/sync/glue/sync_backend_host.h"	12 #include "chrome/browser/sync/glue/sync_backend_host.h"

14 #include "chrome/browser/sync/glue/theme_util.h"	13 #include "chrome/browser/sync/glue/theme_util.h"

	14 #include "chrome/browser/sync/internal_api/read_node.h"

	15 #include "chrome/browser/sync/internal_api/read_transaction.h"

	16 #include "chrome/browser/sync/internal_api/write_node.h"

	17 #include "chrome/browser/sync/internal_api/write_transaction.h"

15 #include "chrome/browser/sync/profile_sync_service.h"	18 #include "chrome/browser/sync/profile_sync_service.h"

16 #include "chrome/browser/sync/protocol/theme_specifics.pb.h"	19 #include "chrome/browser/sync/protocol/theme_specifics.pb.h"

17	20

18 namespace browser_sync {	21 namespace browser_sync {

19	22

20 namespace {	23 namespace {

21	24

22 static const char kThemesTag[] = "google_chrome_themes";	25 static const char kThemesTag[] = "google_chrome_themes";

23 static const char kCurrentThemeNodeTitle[] = "Current Theme";	26 static const char kCurrentThemeNodeTitle[] = "Current Theme";

24	27

(...skipping 75 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
100 bool ThemeModelAssociator::CryptoReadyIfNecessary() {	103 bool ThemeModelAssociator::CryptoReadyIfNecessary() {

101 // We only access the cryptographer while holding a transaction.	104 // We only access the cryptographer while holding a transaction.

102 sync_api::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());	105 sync_api::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());

103 syncable::ModelTypeSet encrypted_types;	106 syncable::ModelTypeSet encrypted_types;

104 encrypted_types = sync_api::GetEncryptedTypes(&trans);	107 encrypted_types = sync_api::GetEncryptedTypes(&trans);

105 return encrypted_types.count(syncable::THEMES) == 0 \|\|	108 return encrypted_types.count(syncable::THEMES) == 0 \|\|

106 sync_service_->IsCryptographerReady(&trans);	109 sync_service_->IsCryptographerReady(&trans);

107 }	110 }

108	111

109 } // namespace browser_sync	112 } // namespace browser_sync

OLD	NEW