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

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/document/DocumentMigrationHelper.java

Issue 1206673003: Merge java_staging/src into java/src. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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.document; 5 package org.chromium.chrome.browser.document;
6 6
7 import android.annotation.TargetApi; 7 import android.annotation.TargetApi;
8 import android.app.Activity; 8 import android.app.Activity;
9 import android.app.ActivityManager; 9 import android.app.ActivityManager;
10 import android.app.ActivityManager.AppTask; 10 import android.app.ActivityManager.AppTask;
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 if (toDocumentMode) { 478 if (toDocumentMode) {
479 migrateTabsFromClassicToDocument(activity, terminateMode); 479 migrateTabsFromClassicToDocument(activity, terminateMode);
480 } else { 480 } else {
481 migrateTabsFromDocumentToClassic(activity, terminateMode); 481 migrateTabsFromDocumentToClassic(activity, terminateMode);
482 } 482 }
483 } finally { 483 } finally {
484 StrictMode.setThreadPolicy(oldPolicy); 484 StrictMode.setThreadPolicy(oldPolicy);
485 } 485 }
486 } 486 }
487 } 487 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698