commit b24bd7fd0b031030a7bd173baccf4df2c303500e
author Chris Poucet <poucet@google.com> Mon Nov 22 21:07:20 2021 +0100
committer Chris Poucet <poucet@google.com> Mon Nov 22 22:35:02 2021 +0100
tree e0381ccf79eb35a83092894d304aeed7893df823
parent a16c51a41448b8dcad39a3ae06bbc1d43257cf01

Make BrowserService and model no longer a singleton.

- Merge browser-service and browser-model.
- Rename BrowserService to BrowserModel
- Move all observables onto BrowserModel.

Google-Bug-Id: b/206459178
Change-Id: I8e3bd48bd169672a4e2bf983501baf3899c0fb28

polygerrit-ui/app/elements/diff/gr-diff-mode-selector/gr-diff-mode-selector.ts

diff --git a/polygerrit-ui/app/elements/diff/gr-diff-mode-selector/gr-diff-mode-selector.ts b/polygerrit-ui/app/elements/diff/gr-diff-mode-selector/gr-diff-mode-selector.ts
index 4f6ae14..0d63360 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-mode-selector/gr-diff-mode-selector.ts
+++ b/polygerrit-ui/app/elements/diff/gr-diff-mode-selector/gr-diff-mode-selector.ts
@@ -27,7 +27,6 @@
 import {FixIronA11yAnnouncer} from '../../../types/types';
 import {getAppContext} from '../../../services/app-context';
 import {fireIronAnnounce} from '../../../utils/event-util';
-import {diffViewMode$} from '../../../services/browser/browser-model';
 
 @customElement('gr-diff-mode-selector')
 export class GrDiffModeSelector extends PolymerElement {
@@ -48,6 +47,9 @@
   @property({type: Boolean})
   showTooltipBelow = false;
 
+  // Private but accessed by tests.
+  readonly browserModel = getAppContext().browserModel;
+
   private readonly userService = getAppContext().userService;
 
   private subscriptions: Subscription[] = [];
@@ -62,7 +64,9 @@
       IronA11yAnnouncer as unknown as FixIronA11yAnnouncer
     ).requestAvailability();
     this.subscriptions.push(
-      diffViewMode$.subscribe(diffView => (this.mode = diffView))
+      this.browserModel.diffViewMode$.subscribe(
+        diffView => (this.mode = diffView)
+      )
     );
   }