[StartSurface] Format and cleanup

Bug: 982018
Change-Id: I6d9bb134e4d98fbd7ebae7a889afd14f880dbfcb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1894139
Commit-Queue: Ganggui Tang <gogerald@chromium.org>
Auto-Submit: Ganggui Tang <gogerald@chromium.org>
Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711704}

chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java

@@ -118,27 +118,33 @@ class StartSurfaceMediator
             });
             mPropertyModel.set(IS_INCOGNITO, mIsIncognito);
 
-            mPropertyModel.set(
-                    BOTTOM_BAR_CLICKLISTENER, new StartSurfaceProperties.BottomBarClickListener() {
-                        // TODO(crbug.com/982018): Animate switching between explore and home
-                        // surface.
-                        @Override
-                        public void onHomeButtonClicked() {
-                            setExploreSurfaceVisibility(false);
-                            notifyStateChange();
-                            RecordUserAction.record("StartSurface.TwoPanes.BottomBar.TapHome");
-                        }
-
-                        @Override
-                        public void onExploreButtonClicked() {
-                            // TODO(crbug.com/982018): Hide the Tab switcher toolbar when showing
-                            // explore surface.
-                            setExploreSurfaceVisibility(true);
-                            notifyStateChange();
-                            RecordUserAction.record(
-                                    "StartSurface.TwoPanes.BottomBar.TapExploreSurface");
-                        }
-                    });
+            if (mSurfaceMode == SurfaceMode.TWO_PANES) {
+                mPropertyModel.set(BOTTOM_BAR_CLICKLISTENER,
+                        new StartSurfaceProperties.BottomBarClickListener() {
+                            // TODO(crbug.com/982018): Animate switching between explore and home
+                            // surface.
+                            @Override
+                            public void onHomeButtonClicked() {
+                                setExploreSurfaceVisibility(false);
+                                notifyStateChange();
+                                RecordUserAction.record("StartSurface.TwoPanes.BottomBar.TapHome");
+                            }
+
+                            @Override
+                            public void onExploreButtonClicked() {
+                                // TODO(crbug.com/982018): Hide the Tab switcher toolbar when
+                                // showing explore surface.
+                                setExploreSurfaceVisibility(true);
+                                notifyStateChange();
+                                RecordUserAction.record(
+                                        "StartSurface.TwoPanes.BottomBar.TapExploreSurface");
+                            }
+                        });
+                mPropertyModel.set(BOTTOM_BAR_HEIGHT,
+                        ContextUtils.getApplicationContext().getResources().getDimensionPixelSize(
+                                R.dimen.ss_bottom_bar_height));
+                mPropertyModel.set(IS_BOTTOM_BAR_VISIBLE, !mIsIncognito);
+            }
 
             if (mSurfaceMode == SurfaceMode.SINGLE_PANE) {
                 mPropertyModel.set(MORE_TABS_CLICK_LISTENER, this);
@@ -153,12 +159,6 @@ class StartSurfaceMediator
                             || ReturnToStartSurfaceUtil.shouldShowExploreSurface())
                     && !mIsIncognito;
             setExploreSurfaceVisibility(shouldShowExploreSurface);
-            if (mSurfaceMode == SurfaceMode.TWO_PANES) {
-                mPropertyModel.set(BOTTOM_BAR_HEIGHT,
-                        ContextUtils.getApplicationContext().getResources().getDimensionPixelSize(
-                                R.dimen.ss_bottom_bar_height));
-                mPropertyModel.set(IS_BOTTOM_BAR_VISIBLE, !mIsIncognito);
-            }
             mPropertyModel.set(MV_TILES_VISIBLE, !mIsIncognito);
 
             // Note that isVoiceSearchEnabled will return false in incognito mode.

chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksSurfaceMediator.java

@@ -76,8 +76,5 @@ class TasksSurfaceMediator {
         // Set the initial state.
         mModel.set(IS_FAKE_SEARCH_BOX_VISIBLE, true);
         mModel.set(IS_VOICE_RECOGNITION_BUTTON_VISIBLE, false);
-
-        // TODO(crbug.com/982018): Enable voice recognition button in the fake search box.
-        // TODO(crbug.com/982018): Change the fake search box in dark mode.
     }
 }