chrome/app/android/chrome_main_delegate_android_initializer.cc - Issue 1320253002: Merge ChromeMainDelegateStagingAndroid into ChromeMainDelegateAndroid.

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/app/android/chrome_main_delegate_android_initializer.cc

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

« no previous file with comments | « chrome/app/android/chrome_main_delegate_android.cc ('k') | chrome/browser/android/chrome_main_delegate_staging_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/app/android/chrome_main_delegate_android_initializer.cc

diff --git a/chrome/browser/android/chrome_main_delegate_staging_android_initializer.cc b/chrome/app/android/chrome_main_delegate_android_initializer.cc

similarity index 70%

rename from chrome/browser/android/chrome_main_delegate_staging_android_initializer.cc

rename to chrome/app/android/chrome_main_delegate_android_initializer.cc

index 97e163be782e3f68145b05e8645ff8aafd38ed04..5917c0b36699ceba3d80009800726e1f4a85c1be 100644

--- a/chrome/browser/android/chrome_main_delegate_staging_android_initializer.cc

+++ b/chrome/app/android/chrome_main_delegate_android_initializer.cc

@@ -3,8 +3,7 @@

// found in the LICENSE file.

#include "chrome/app/android/chrome_main_delegate_android.h"

-#include "chrome/browser/android/chrome_main_delegate_staging_android.h"

ChromeMainDelegateAndroid* ChromeMainDelegateAndroid::Create() {

- return new ChromeMainDelegateStagingAndroid();

+ return new ChromeMainDelegateAndroid();

}