STASH: Epic Experimental patch for toolkit-views App List on Mac

ui/views_content_client/views_content_client_main_parts_mac.mm

 // Copyright 2014 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/files/file_path.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/path_service.h"
+#include "content/public/browser/context_factory.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/common/content_paths.h"
 #include "content/shell/browser/shell_browser_context.h"
+#include "ui/views/test/desktop_test_views_delegate.h"
 #include "ui/views_content_client/views_content_client.h"
 #include "ui/views_content_client/views_content_client_main_parts.h"
 
 // A simple NSApplicationDelegate that provides a basic mainMenu and can
 // activate a task when the application has finished loading.
 @interface ViewsContentClientAppController : NSObject<NSApplicationDelegate> {
  @private
   base::Closure task_;
 }
 
@@ skipping 11 matching lines @@
   ViewsContentClientMainPartsMac(
       const content::MainFunctionParams& content_params,
       ViewsContentClient* views_content_client);
   virtual ~ViewsContentClientMainPartsMac();
 
   // content::BrowserMainParts:
   virtual void PreMainMessageLoopRun() override;
 
  private:
   base::scoped_nsobject<ViewsContentClientAppController> app_controller_;
+  scoped_ptr<views::ViewsDelegate> composited_views_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainPartsMac);
 };
 
+class CompositedTestViewsDelegate : public views::DesktopTestViewsDelegate {
+ public:
+  virtual ui::ContextFactory* GetContextFactory() OVERRIDE {
+    return content::GetContextFactory();
+  }
+};
+
 ViewsContentClientMainPartsMac::ViewsContentClientMainPartsMac(
     const content::MainFunctionParams& content_params,
     ViewsContentClient* views_content_client)
     : ViewsContentClientMainParts(content_params, views_content_client) {
   // Cache the child process path to avoid triggering an AssertIOAllowed.
   base::FilePath child_process_exe;
   PathService::Get(content::CHILD_PROCESS_EXE, &child_process_exe);
 
   // Disable plugin discovery since NPAPI plugin support on Mac requires this to
   // be done in a utility process type which isn't bundled with this executable.
   content::PluginService::GetInstance()->DisablePluginsDiscoveryForTesting();
 
   app_controller_.reset([[ViewsContentClientAppController alloc] init]);
   [[NSApplication sharedApplication] setDelegate:app_controller_];
 }
 
 void ViewsContentClientMainPartsMac::PreMainMessageLoopRun() {
   ViewsContentClientMainParts::PreMainMessageLoopRun();
 
+  views_delegate_.reset();  // FIXME
+
+  // If run with --enable-delegated-renderer, the GPU channel factory and image
+  // transport factory for communicating with the GPU process should already be
+  // initialized. This is the default on Mac as of r281692. Otherwise, this file
+  // needs a content/browser dependency and some initialization steps here.
+  composited_views_delegate_.reset(new CompositedTestViewsDelegate);
+
   // On Mac, the task must be deferred to applicationDidFinishLaunching. If not,
   // the widget can activate, but (even if configured) the mainMenu won't be
   // ready to switch over in the OSX UI, so it will look strange.
   NSWindow* window_context = nil;
   [app_controller_ setTask:base::Bind(views_content_client()->task(),
                                       base::Unretained(browser_context()),
                                       base::Unretained(window_context))];
 }
 
 ViewsContentClientMainPartsMac::~ViewsContentClientMainPartsMac() {
@@ skipping 37 matching lines @@
   NSString* quitTitle = [@"Quit " stringByAppendingString:appName];
   [appMenu addItemWithTitle:quitTitle
                      action:@selector(terminate:)
               keyEquivalent:@"q"];
   [appMenuItem setSubmenu:appMenu];
 
   task_.Run();
 }
 
 @end