Merge crbug.com/232556 to M28 branch (1500).

content/browser/gpu/gpu_internals_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/gpu/gpu_internals_ui.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 461 matching lines @@
       public GpuDataManagerObserver {
  public:
   GpuMessageHandler();
   virtual ~GpuMessageHandler();
 
   // WebUIMessageHandler implementation.
   virtual void RegisterMessages() OVERRIDE;
 
   // GpuDataManagerObserver implementation.
   virtual void OnGpuInfoUpdate() OVERRIDE;
-
-  // Gpu switch handler.
-  void OnGpuSwitch();
+  virtual void OnGpuSwitching() OVERRIDE;
 
   // Messages
   void OnBrowserBridgeInitialized(const base::ListValue* list);
   void OnCallAsync(const base::ListValue* list);
 
   // Submessages dispatched from OnCallAsync
   base::Value* OnRequestClientInfo(const base::ListValue* list);
   base::Value* OnRequestLogMessages(const base::ListValue* list);
 
  private:
   // True if observing the GpuDataManager (re-attaching as observer would
   // DCHECK).
   bool observing_;
 
-  GpuDataManagerImpl::GpuSwitchCallback gpu_switch_callback_;
-
   DISALLOW_COPY_AND_ASSIGN(GpuMessageHandler);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // GpuMessageHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 GpuMessageHandler::GpuMessageHandler()
-    : observing_(false),
-      gpu_switch_callback_(base::Bind(&GpuMessageHandler::OnGpuSwitch,
-                                      base::Unretained(this))) {
+    : observing_(false) {
 }
 
 GpuMessageHandler::~GpuMessageHandler() {
   GpuDataManagerImpl::GetInstance()->RemoveObserver(this);
-  GpuDataManagerImpl::GetInstance()->RemoveGpuSwitchCallback(
-      gpu_switch_callback_);
 }
 
 /* BrowserBridge.callAsync prepends a requestID to these messages. */
 void GpuMessageHandler::RegisterMessages() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   web_ui()->RegisterMessageCallback("browserBridgeInitialized",
       base::Bind(&GpuMessageHandler::OnBrowserBridgeInitialized,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("callAsync",
@@ skipping 46 matching lines @@
     web_ui()->CallJavascriptFunction("browserBridge.onCallAsyncReply",
         *requestId);
   }
 }
 
 void GpuMessageHandler::OnBrowserBridgeInitialized(
     const base::ListValue* args) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Watch for changes in GPUInfo
-  if (!observing_) {
+  if (!observing_)
     GpuDataManagerImpl::GetInstance()->AddObserver(this);
-    GpuDataManagerImpl::GetInstance()->AddGpuSwitchCallback(
-        gpu_switch_callback_);
-  }
   observing_ = true;
 
   // Tell GpuDataManager it should have full GpuInfo. If the
   // Gpu process has not run yet, this will trigger its launch.
   GpuDataManagerImpl::GetInstance()->RequestCompleteGpuInfoIfNeeded();
 
   // Run callback immediately in case the info is ready and no update in the
   // future.
   OnGpuInfoUpdate();
 }
@@ skipping 31 matching lines @@
   // Add in blacklisting features
   base::Value* feature_status = GetFeatureStatus();
   if (feature_status)
     gpu_info_val->Set("featureStatus", feature_status);
 
   // Send GPU Info to javascript.
   web_ui()->CallJavascriptFunction("browserBridge.onGpuInfoUpdate",
       *(gpu_info_val.get()));
 }
 
-void GpuMessageHandler::OnGpuSwitch() {
+void GpuMessageHandler::OnGpuSwitching() {
   GpuDataManagerImpl::GetInstance()->RequestCompleteGpuInfoIfNeeded();
 }
 
 }  // namespace
 
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // GpuInternalsUI
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 GpuInternalsUI::GpuInternalsUI(WebUI* web_ui)
     : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new GpuMessageHandler());
 
   // Set up the chrome://gpu/ source.
   BrowserContext* browser_context =
       web_ui->GetWebContents()->GetBrowserContext();
   WebUIDataSource::Add(browser_context, CreateGpuHTMLSource());
 }
 
 }  // namespace content