chrome/browser/sync/sync_global_error.h - Issue 11886079: Revert 177136 due to memory error on Mac ASAN

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/sync_global_error.h

Issue 11886079: Revert 177136 due to memory error on Mac ASAN (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 7 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/browser/sync/profile_sync_service_unittest.cc ('k') | chrome/browser/sync/sync_global_error.cc » ('j') | no next file with comments »

OLD	NEW
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 #ifndef CHROME_BROWSER_SYNC_SYNC_GLOBAL_ERROR_H_	5 #ifndef CHROME_BROWSER_SYNC_SYNC_GLOBAL_ERROR_H_

6 #define CHROME_BROWSER_SYNC_SYNC_GLOBAL_ERROR_H_	6 #define CHROME_BROWSER_SYNC_SYNC_GLOBAL_ERROR_H_

7	7

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

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

10 #include "chrome/browser/api/sync/profile_sync_service_observer.h"	10 #include "chrome/browser/api/sync/profile_sync_service_observer.h"

(...skipping 22 matching lines...) Expand all Loading...
33 virtual string16 GetBubbleViewMessage() OVERRIDE;	33 virtual string16 GetBubbleViewMessage() OVERRIDE;

34 virtual string16 GetBubbleViewAcceptButtonLabel() OVERRIDE;	34 virtual string16 GetBubbleViewAcceptButtonLabel() OVERRIDE;

35 virtual string16 GetBubbleViewCancelButtonLabel() OVERRIDE;	35 virtual string16 GetBubbleViewCancelButtonLabel() OVERRIDE;

36 virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE;	36 virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE;

37 virtual void BubbleViewAcceptButtonPressed(Browser* browser) OVERRIDE;	37 virtual void BubbleViewAcceptButtonPressed(Browser* browser) OVERRIDE;

38 virtual void BubbleViewCancelButtonPressed(Browser* browser) OVERRIDE;	38 virtual void BubbleViewCancelButtonPressed(Browser* browser) OVERRIDE;

39	39

40 // ProfileSyncServiceObserver implementation.	40 // ProfileSyncServiceObserver implementation.

41 virtual void OnStateChanged() OVERRIDE;	41 virtual void OnStateChanged() OVERRIDE;

42	42

	43 // For non-ChromeOS we customize the "Sign in to sync" wrench menu item

	44 // instead of adding a new wrench menu item at the bottom.

	45 bool HasCustomizedSyncMenuItem();

	46

43 private:	47 private:

44 string16 bubble_accept_label_;	48 string16 bubble_accept_label_;

45 string16 bubble_message_;	49 string16 bubble_message_;

46 string16 menu_label_;	50 string16 menu_label_;

47 ProfileSyncService* service_;	51 ProfileSyncService* service_;

48 SigninManager* signin_;	52 SigninManager* signin_;

49	53

50 DISALLOW_COPY_AND_ASSIGN(SyncGlobalError);	54 DISALLOW_COPY_AND_ASSIGN(SyncGlobalError);

51 };	55 };

52	56

53 #endif // CHROME_BROWSER_SYNC_SYNC_GLOBAL_ERROR_H_	57 #endif // CHROME_BROWSER_SYNC_SYNC_GLOBAL_ERROR_H_

OLD	NEW