Promotes metro related functions to MetroViewerProcessHost

Since all these functions need the MetroViewerProcessHost it makes
more sense to put them here.

BUG=none
TEST=none
R=ananta@chromium.org

Review URL: https://codereview.chromium.org/294043011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273418 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 27 deletions

diff --git a/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc b/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc
index 47337c3..300eebd 100644
--- a/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc
+++ b/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc
@@ -67,28 +67,14 @@ void OpenURL(const GURL& url) {
 
 }  // namespace
 
-void HandleActivateDesktop(const base::FilePath& path, bool ash_exit) {
-  if (ChromeMetroViewerProcessHost::instance()) {
-    ChromeMetroViewerProcessHost::instance()->Send(
-        new MetroViewerHostMsg_ActivateDesktop(path, ash_exit));
-  }
-}
-
-// static
-ChromeMetroViewerProcessHost* ChromeMetroViewerProcessHost::instance_ = NULL;
-
 ChromeMetroViewerProcessHost::ChromeMetroViewerProcessHost()
     : MetroViewerProcessHost(
           content::BrowserThread::GetMessageLoopProxyForThread(
               content::BrowserThread::IO)) {
   chrome::IncrementKeepAliveCount();
-  DCHECK(instance_ == NULL);
-  instance_ = this;
 }
 
 ChromeMetroViewerProcessHost::~ChromeMetroViewerProcessHost() {
-  DCHECK(instance_ == this);
-  instance_ = NULL;
 }
 
 void ChromeMetroViewerProcessHost::OnChannelError() {
diff --git a/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h b/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h
index 50c6aed..d864972 100644
--- a/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h
+++ b/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h
@@ -11,25 +11,15 @@ namespace base {
 class FilePath;
 }
 
-// Handles the activate desktop command for Metro Chrome Ash.   The |ash_exit|
-// parameter indicates whether the Ash process would be shutdown after
-// activating the desktop.
-void HandleActivateDesktop(const base::FilePath& shortcut, bool ash_exit);
-
 class ChromeMetroViewerProcessHost : public win8::MetroViewerProcessHost {
  public:
   ChromeMetroViewerProcessHost();
   virtual ~ChromeMetroViewerProcessHost();
 
-  // Returns the singleton ChromeMetroViewerProcessHost instance. This may
-  // return NULL.
-  static ChromeMetroViewerProcessHost* instance() {
-    return instance_;
-  }
-
  private:
   // win8::MetroViewerProcessHost implementation
   virtual void OnChannelError() OVERRIDE;
+
   // IPC::Listener implementation
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
   virtual void OnSetTargetSurface(gfx::NativeViewId target_surface,
@@ -39,8 +29,6 @@ class ChromeMetroViewerProcessHost : public win8::MetroViewerProcessHost {
       const base::string16& search_string) OVERRIDE;
   virtual void OnWindowSizeChanged(uint32 width, uint32 height) OVERRIDE;
 
-  static ChromeMetroViewerProcessHost* instance_;
-
   DISALLOW_COPY_AND_ASSIGN(ChromeMetroViewerProcessHost);
 };