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

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiInstanceChromeTabbedActivity.java

Issue 1206673003: Merge java_staging/src into java/src. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 6 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 package org.chromium.chrome.browser.multiwindow; 5 package org.chromium.chrome.browser.multiwindow;
6 6
7 import org.chromium.chrome.browser.ChromeTabbedActivity; 7 import org.chromium.chrome.browser.ChromeTabbedActivity;
8 8
9 /** 9 /**
10 * An Activity to launch ChromeTabbedActivity without "singleTask" launchMode. 10 * An Activity to launch ChromeTabbedActivity without "singleTask" launchMode.
11 * This is needed because a chrome launcher activity and a chrome UI activity sh ould be in the same 11 * This is needed because a chrome launcher activity and a chrome UI activity sh ould be in the same
12 * task to support samsung multi-instance. 12 * task to support samsung multi-instance.
13 */ 13 */
14 public class MultiInstanceChromeTabbedActivity extends ChromeTabbedActivity {} 14 public class MultiInstanceChromeTabbedActivity extends ChromeTabbedActivity {}
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698