chrome/browser/sync/sync_setup_flow.h - Issue 279004: Made sync code build and pass unit tests on OS X.

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

Unified Diff: chrome/browser/sync/sync_setup_flow.h

Issue 279004: Made sync code build and pass unit tests on OS X. (Closed)

Patch Set: Fixed uninitialized var error. Created 11 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:

Index: chrome/browser/sync/sync_setup_flow.h

diff --git a/chrome/browser/views/sync/sync_setup_flow.h b/chrome/browser/sync/sync_setup_flow.h

similarity index 96%

rename from chrome/browser/views/sync/sync_setup_flow.h

rename to chrome/browser/sync/sync_setup_flow.h

index 4bc7d6042fcc117b9e775bd5aea5daed758d679c..32e3db10c0e3f96d80eacb4eb550418e9ab47b69 100644

--- a/chrome/browser/views/sync/sync_setup_flow.h

+++ b/chrome/browser/sync/sync_setup_flow.h

@@ -4,8 +4,8 @@

#ifdef CHROME_PERSONALIZATION

-#ifndef CHROME_BROWSER_VIEWS_SYNC_SYNC_SETUP_FLOW_H_

-#define CHROME_BROWSER_VIEWS_SYNC_SYNC_SETUP_FLOW_H_

+#ifndef CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_

+#define CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_

#include <string>

#include <vector>

@@ -14,7 +14,7 @@

#include "base/time.h"

#include "chrome/browser/dom_ui/html_dialog_ui.h"

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

-#include "chrome/browser/views/sync/sync_setup_wizard.h"

+#include "chrome/browser/sync/sync_setup_wizard.h"

#include "grit/generated_resources.h"

#include "testing/gtest/include/gtest/gtest_prod.h"

@@ -185,5 +185,5 @@ class FlowHandler : public DOMMessageHandler {

DISALLOW_COPY_AND_ASSIGN(FlowHandler);

};

-#endif // CHROME_BROWSER_VIEWS_SYNC_SYNC_SETUP_FLOW_H_

+#endif // CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_

#endif // CHROME_PERSONALIZATION