Use onOptionsItemSelected in Physical Web activity

chrome/android/java/src/org/chromium/chrome/browser/physicalweb/ListUrlsActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/physicalweb/ListUrlsActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/ListUrlsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/ListUrlsActivity.java
index 51b887c66c6957fbb2fc08ce9f0d0acb644c500a..13ba30f68ae475c0dd4ccc6e9f407755f6021719 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/ListUrlsActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/ListUrlsActivity.java
@@ -29,6 +29,7 @@ import android.widget.TextView;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ContextUtils;
+import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeApplication;
@@ -133,46 +134,43 @@ public class ListUrlsActivity extends AppCompatActivity implements AdapterView.O
 
         Drawable tintedRefresh = ContextCompat.getDrawable(this, R.drawable.btn_toolbar_reload);
         tintedRefresh.setColorFilter(tintColor, PorterDuff.Mode.SRC_IN);
-        MenuItem refreshItem = menu.add(R.string.physical_web_refresh)
+        menu.add(0, R.id.menu_id_refresh, 0, R.string.physical_web_refresh)

[mattreynolds, 2016/06/01 00:00:14]

The order param treats 0 as a special value (Menu.NONE means "don't care about
the order"); we should use something else if we do care about the order.

                 .setIcon(tintedRefresh)
                 .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_ALWAYS);
-        refreshItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem item) {
-                startRefresh(true, false);
-                return true;
-            }
-        });
 
-        MenuItem closeItem = menu.add(R.string.close)
+        menu.add(0, R.id.menu_id_close, 1, R.string.close)

[mattreynolds, 2016/06/01 00:00:13]

Do we want to make this the rightmost button?

                 .setIcon(R.drawable.btn_close)
                 .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_ALWAYS);
-        closeItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem item) {
-                finish();
-                return true;
-            }
-        });
 
         Drawable tintedSettings = ContextCompat.getDrawable(this, R.drawable.settings_cog);
         tintedSettings.setColorFilter(tintColor, PorterDuff.Mode.SRC_IN);
-        MenuItem settingsButton = menu.add(R.string.menu_preferences)
+        menu.add(0, R.id.menu_id_settings, 2, R.string.menu_preferences)
                 .setIcon(tintedSettings)
                 .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-        settingsButton.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem item) {
-                Intent intent = PreferencesLauncher.createIntentForSettingsPage(
-                        ListUrlsActivity.this, PhysicalWebPreferenceFragment.class.getName());
-                startActivity(intent);
-                return true;
-            }
-        });
 
         return super.onCreateOptionsMenu(menu);
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        if (id == R.id.menu_id_close) {
+            finish();
+            return true;
+        } else if (id == R.id.menu_id_refresh) {
+            startRefresh(true, false);
+            return true;
+        } else if (id == R.id.menu_id_settings) {
+            Intent intent = PreferencesLauncher.createIntentForSettingsPage(
+                    this, PhysicalWebPreferenceFragment.class.getName());
+            startActivity(intent);
+            return true;
+        }
+
+        Log.e(TAG, "Unknown menu item selected");
+        return super.onOptionsItemSelected(item);
+    }
+
     private void foregroundSubscribe() {
         mPhysicalWebBleClient.foregroundSubscribe(this);
     }