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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "chrome/app/android/chrome_main_delegate_android.h" 5 #include "chrome/app/android/chrome_main_delegate_android.h"
6 #include "chrome/browser/android/chrome_main_delegate_staging_android.h"
7 6
8 ChromeMainDelegateAndroid* ChromeMainDelegateAndroid::Create() { 7 ChromeMainDelegateAndroid* ChromeMainDelegateAndroid::Create() {
9 return new ChromeMainDelegateStagingAndroid(); 8 return new ChromeMainDelegateAndroid();
10 } 9 }
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698