| Index: chrome/browser/google_url_tracker.h
|
| ===================================================================
|
| --- chrome/browser/google_url_tracker.h (revision 24751)
|
| +++ chrome/browser/google_url_tracker.h (working copy)
|
| @@ -56,6 +56,8 @@
|
|
|
| static void RegisterPrefs(PrefService* prefs);
|
|
|
| + static const char kDefaultGoogleHomepage[];
|
| +
|
| private:
|
| FRIEND_TEST(GoogleURLTrackerTest, CheckAndConvertURL);
|
|
|
| @@ -88,8 +90,6 @@
|
| const NotificationSource& source,
|
| const NotificationDetails& details);
|
|
|
| - static const char kDefaultGoogleHomepage[];
|
| -
|
| NotificationRegistrar registrar_;
|
| GURL google_url_;
|
| ScopedRunnableMethodFactory<GoogleURLTracker> fetcher_factory_;
|
|
|
| Property changes on: chrome\browser\google_url_tracker.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/chrome/browser/google_url_tracker.h:r69-2775
|
| Merged /trunk/src/chrome/browser/google_url_tracker.h:r24736
|
|
|
|
|