Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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.chromoting; | 5 package org.chromium.chromoting; |
| 6 | 6 |
| 7 import android.annotation.SuppressLint; | 7 import android.annotation.SuppressLint; |
| 8 import android.app.ProgressDialog; | 8 import android.app.ProgressDialog; |
| 9 import android.content.DialogInterface; | 9 import android.content.DialogInterface; |
| 10 import android.content.Intent; | 10 import android.content.Intent; |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 27 import android.widget.AdapterView; | 27 import android.widget.AdapterView; |
| 28 import android.widget.ArrayAdapter; | 28 import android.widget.ArrayAdapter; |
| 29 import android.widget.LinearLayout; | 29 import android.widget.LinearLayout; |
| 30 import android.widget.ListView; | 30 import android.widget.ListView; |
| 31 import android.widget.Toast; | 31 import android.widget.Toast; |
| 32 | 32 |
| 33 import org.chromium.base.ApiCompatibilityUtils; | 33 import org.chromium.base.ApiCompatibilityUtils; |
| 34 import org.chromium.base.Log; | 34 import org.chromium.base.Log; |
| 35 import org.chromium.chromoting.accountswitcher.AccountSwitcher; | 35 import org.chromium.chromoting.accountswitcher.AccountSwitcher; |
| 36 import org.chromium.chromoting.accountswitcher.AccountSwitcherFactory; | 36 import org.chromium.chromoting.accountswitcher.AccountSwitcherFactory; |
| 37 import org.chromium.chromoting.cardboard.DesktopActivity; | |
|
Torne
2016/04/15 14:22:43
Left over?
Peter Wen
2016/04/18 18:49:58
Removed, will fix our imports in a separate refact
| |
| 37 import org.chromium.chromoting.help.HelpContext; | 38 import org.chromium.chromoting.help.HelpContext; |
| 38 import org.chromium.chromoting.help.HelpSingleton; | 39 import org.chromium.chromoting.help.HelpSingleton; |
| 39 import org.chromium.chromoting.jni.Client; | 40 import org.chromium.chromoting.jni.Client; |
| 40 import org.chromium.chromoting.jni.ConnectionListener; | 41 import org.chromium.chromoting.jni.ConnectionListener; |
| 41 import org.chromium.chromoting.jni.JniInterface; | 42 import org.chromium.chromoting.jni.JniInterface; |
| 42 | 43 |
| 43 import java.util.ArrayList; | 44 import java.util.ArrayList; |
| 44 import java.util.Arrays; | 45 import java.util.Arrays; |
| 45 | 46 |
| 46 /** | 47 /** |
| (...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 638 // Unreachable, but required by Google Java style and findbugs. | 639 // Unreachable, but required by Google Java style and findbugs. |
| 639 assert false : "Unreached"; | 640 assert false : "Unreached"; |
| 640 } | 641 } |
| 641 | 642 |
| 642 if (dismissProgress && mProgressIndicator != null) { | 643 if (dismissProgress && mProgressIndicator != null) { |
| 643 mProgressIndicator.dismiss(); | 644 mProgressIndicator.dismiss(); |
| 644 mProgressIndicator = null; | 645 mProgressIndicator = null; |
| 645 } | 646 } |
| 646 } | 647 } |
| 647 } | 648 } |
| OLD | NEW |