Show Media Router toolbar icon ephemerally for MR dialogs

chrome/browser/media/router/media_router_ui_service.h

Index: chrome/browser/media/router/media_router_ui_service.h
diff --git a/chrome/browser/media/router/media_router_ui_service.h b/chrome/browser/media/router/media_router_ui_service.h
index 43b65107709183785d90895b2976b57e8e898878..3ca57fa44afe36fed1bfa1698a6b400355355e6d 100644
--- a/chrome/browser/media/router/media_router_ui_service.h
+++ b/chrome/browser/media/router/media_router_ui_service.h
@@ -23,10 +23,12 @@ class MediaRouterUIService : public KeyedService {
 
   static MediaRouterUIService* Get(Profile* profile);
 
+  virtual MediaRouterActionController* action_controller() const;
+
  private:
   friend class MediaRouterUIBrowserTest;
 
-  MediaRouterActionController action_controller_;
+  std::unique_ptr<MediaRouterActionController> action_controller_;

[msw, 2016/11/04 00:07:16]

Why is this now a unique_ptr?

[takumif, 2016/11/09 04:37:27]

This was for being able to expose it through the action_controller() getter. If
I kept action_controller_ a simple MediaRouterActionController,
action_controller() would've had to return a reference to it, which would be
const.

[msw, 2016/11/09 20:32:33]

That's only because action_controller() is const. Should the function not be
const? (is it actually okay for a client to modify the
MediaRouterActionController instance given a const MediaRouterUIService?)

[takumif, 2016/11/10 01:53:59]

Ah. Yes, it is expected that MediaRouterActionController is modified, so no,
action_controller() shouldn't be const. Making it non-const and removing the use
of a unique_ptr.

 
   DISALLOW_COPY_AND_ASSIGN(MediaRouterUIService);
 };