Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3926)

Unified Diff: chrome/browser/android/chrome_sync_shell_main_delegate.h

Issue 1320253002: Merge ChromeMainDelegateStagingAndroid into ChromeMainDelegateAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: used more specific DEPS rule Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/chrome_sync_shell_main_delegate.h
diff --git a/chrome/browser/android/chrome_sync_shell_main_delegate.h b/chrome/browser/android/chrome_sync_shell_main_delegate.h
index c4d2d8892e0e708bc41c7e82c6e0c941d803f39d..f786fc77358d2ca9941dc357d3dbcf1f808c73b4 100644
--- a/chrome/browser/android/chrome_sync_shell_main_delegate.h
+++ b/chrome/browser/android/chrome_sync_shell_main_delegate.h
@@ -5,10 +5,9 @@
#ifndef CHROME_BROWSER_ANDROID_CHROME_SYNC_SHELL_MAIN_DELEGATE_H_
#define CHROME_BROWSER_ANDROID_CHROME_SYNC_SHELL_MAIN_DELEGATE_H_
-#include "chrome/browser/android/chrome_main_delegate_staging_android.h"
+#include "chrome/app/android/chrome_main_delegate_android.h"
-class ChromeSyncShellMainDelegate
- : public ChromeMainDelegateStagingAndroid {
+class ChromeSyncShellMainDelegate : public ChromeMainDelegateAndroid {
public:
ChromeSyncShellMainDelegate();
~ChromeSyncShellMainDelegate() override;

Powered by Google App Engine
This is Rietveld 408576698