speedreader: PR fixups

* Remove unnecessary deps
  * Delete old commented out code
  * Fix typo in generated resources
  * Make naming more clear

app/brave_generated_resources.grd

@@ -1168,7 +1168,7 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
         <message name="IDS_PAGE_IS_DISTILLED" desc="Speedreader is enabled on this page">
           in Speedreader
         </message>
-        <message name="IDS_ICON_READER_MODE_LABEL" desc="Icon label indicating Speedreader is enabled">
+        <message name="IDS_ICON_READER_MODE_LABEL" desc="Icon label indicating Reader Mode is enabled">
           Reader Mode
         </message>
         <message name="IDS_ICON_SPEEDREADER_MODE_LABEL" desc="Icon label indicating Speedreader is enabled">

browser/speedreader/speedreader_tab_helper.cc

@@ -135,14 +135,21 @@ void SpeedreaderTabHelper::OnBubbleClosed() {
   browser->window()->UpdatePageActionIcon(PageActionIconType::kReaderMode);
 }
 
-// Displays speedreader information
-void SpeedreaderTabHelper::ShowBubble() {
+void SpeedreaderTabHelper::ShowSpeedreaderBubble() {
+  ShowBubble(true);
+}
+
+void SpeedreaderTabHelper::ShowReaderModeBubble() {
+  ShowBubble(false);
+}
+
+void SpeedreaderTabHelper::ShowBubble(bool is_bubble_speedreader) {
   auto* contents = web_contents();
   Browser* browser = chrome::FindBrowserWithWebContents(contents);
   DCHECK(browser);
-  const bool enabled = distill_state_ == DistillState::kSpeedreaderMode;
-  speedreader_bubble_ = static_cast<BraveBrowserWindow*>(browser->window())
-                            ->ShowSpeedreaderBubble(this, enabled);
+  speedreader_bubble_ =
+      static_cast<BraveBrowserWindow*>(browser->window())
+          ->ShowSpeedreaderBubble(this, is_bubble_speedreader);
   browser->window()->UpdatePageActionIcon(PageActionIconType::kReaderMode);
 }
 

browser/speedreader/speedreader_tab_helper.h

@@ -56,7 +56,10 @@ class SpeedreaderTabHelper
   SpeedreaderBubbleView* speedreader_bubble_view() const;
 
   // Displays speedreader information
-  void ShowBubble();
+  void ShowSpeedreaderBubble();
+
+  // Displays reader mode information
+  void ShowReaderModeBubble();
 
   // Hides speedreader information
   void HideBubble();
@@ -68,6 +71,11 @@ class SpeedreaderTabHelper
   friend class content::WebContentsUserData<SpeedreaderTabHelper>;
   explicit SpeedreaderTabHelper(content::WebContents* web_contents);
 
+  // Called by ShowSpeedreaderBubble and ShowReaderModeBubble.
+  // |is_bubble_speedreader| will show a bubble for pages in Speedreader if set
+  // to true, otherwise pages in reader mode.
+  void ShowBubble(bool is_bubble_speedreader);
+
   void UpdateActiveState(content::NavigationHandle* handle);
 
   // content::WebContentsObserver

browser/ui/browser_commands.cc

@@ -110,22 +110,22 @@ void ShowSpeedreaderBubble(Browser* browser) {
       if (!tab_helper)
         return;
 
+      const bool speedreader_enabled = tab_helper->IsSpeedreaderEnabled();
       const DistillState state = tab_helper->PageDistillState();
       if (state == DistillState::kNone) {
         // If this is called on an undistilled page, we single shot it.
         tab_helper->SingleShotSpeedreader();
-
-        if (tab_helper->IsSpeedreaderEnabled())
-          return;
       }
 
-      // If Speedreader is already enabled, don't show the bubble.
-      // fixme: we need to |or| with an "asked" counter
-      if (state == DistillState::kNone || state == DistillState::kReaderMode) {
-        if (tab_helper->IsSpeedreaderEnabled())
-          return;
+      if (state == DistillState::kSpeedreaderMode) {
+        tab_helper->ShowSpeedreaderBubble();
+      } else {
+        if (speedreader_enabled && !tab_helper->IsEnabledForSite()) {
+          tab_helper->ShowSpeedreaderBubble();
+        } else {
+          tab_helper->ShowReaderModeBubble();
+        }
       }
-      tab_helper->ShowBubble();
     }
   }
 #endif  // BUILDFLAG(ENABLE_SPEEDREADER)

browser/ui/speedreader/speedreader_bubble_browsertest.cc

@@ -23,7 +23,12 @@ class SpeedreaderBubbleBrowserTest : public DialogBrowserTest {
       delete;
 
   // DialogBrowserTest:
-  void ShowUi(const std::string& name) override { tab_helper()->ShowBubble(); }
+  void ShowUi(const std::string& name) override {
+    if (tab_helper()->IsSpeedreaderEnabled())
+      tab_helper()->ShowSpeedreaderBubble();
+    else
+      tab_helper()->ShowReaderModeBubble();
+  }
 
  protected:
   bool NavigateToNewTab() {

browser/ui/views/speedreader/speedreader_icon_view.cc

@@ -145,7 +145,6 @@ SkColor SpeedreaderIconView::GetIconLabelBubbleSurroundingForegroundColor()
 
 SkColor SpeedreaderIconView::GetIconLabelBubbleInkDropColor() const {
   return kReaderIconColor;
-  // return icon_label_bubble_delegate_->GetIconLabelBubbleBackgroundColor();
 }
 
 SkColor SpeedreaderIconView::GetIconLabelBubbleBackgroundColor() const {

components/speedreader/BUILD.gn

@@ -1,5 +1,3 @@
-import("//brave/components/speedreader/buildflags/buildflags.gni")
-
 source_set("speedreader") {
   public_deps = [
     "rust/ffi",