Small refactorings on chrome://gpu before I move it to src/content.

-remove chrome://gpu-internals and just have chrome://gpu
-remove tabs since that is empty and just links to chrome://tracing (also will be moved in a future change)
-move the disable panel fitting switch to content. the gpu feature flag is already there, so this seems equivalent
-get the version from ContentClient. This is slightly less information, but it's possible to extrapolate the rest
-don't duplicate the list of crashes (checked with Tom that this is ok)

BUG=169170
Review URL: https://codereview.chromium.org/12095073

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

19 files changed, 36 insertions, 167 deletions

diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index 37399cb..4ab1672 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -45,9 +45,6 @@ const char kAshDisableDisplayChangeLimiter[] =
 // Disables boot animation v2, go back to v1.
 const char kAshDisableBootAnimation2[] = "ash-disable-boot-animation2";
 
-// Disables panel fitting (used for mirror mode).
-const char kAshDisablePanelFitting[] = "ash-disable-panel-fitting";
-
 // Enable advanced gestures (e.g. for window management).
 const char kAshEnableAdvancedGestures[] = "ash-enable-advanced-gestures";
 
diff --git a/ash/ash_switches.h b/ash/ash_switches.h
index 435eb8d..b375d0f 100644
--- a/ash/ash_switches.h
+++ b/ash/ash_switches.h
@@ -25,7 +25,6 @@ ASH_EXPORT extern const char kAshCopyHostBackgroundAtBoot[];
 ASH_EXPORT extern const char kAshDebugShortcuts[];
 ASH_EXPORT extern const char kAshDisableAutoWindowPlacement[];
 ASH_EXPORT extern const char kAshDisableDisplayChangeLimiter[];
-ASH_EXPORT extern const char kAshDisablePanelFitting[];
 ASH_EXPORT extern const char kAshDisablePerAppLauncher[];
 ASH_EXPORT extern const char kAshDisableBootAnimation2[];
 ASH_EXPORT extern const char kAshDisableNewLockAnimations[];
diff --git a/ash/shell.cc b/ash/shell.cc
index e9e0c2b..402c557 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -110,6 +110,7 @@
 #include "base/message_pump_aurax11.h"
 #include "chromeos/display/output_configurator.h"
 #include "content/public/browser/gpu_data_manager.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/common/gpu_feature_type.h"
 #endif  // defined(OS_CHROMEOS)
 
@@ -211,7 +212,7 @@ Shell::Shell(ShellDelegate* delegate)
   bool is_panel_fitting_disabled =
       (blacklisted_features & content::GPU_FEATURE_TYPE_PANEL_FITTING) ||
       CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kAshDisablePanelFitting);
+          ::switches::kDisablePanelFitting);
 
   output_configurator_->Init(
       !is_panel_fitting_disabled,
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index e848c8b..45e00c5 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -29,7 +29,7 @@ const char* const kPaths[] = {
   chrome::kChromeUICreditsHost,
   chrome::kChromeUIDNSHost,
   chrome::kChromeUIFlagsHost,
-  chrome::kChromeUIGpuInternalsHost,
+  chrome::kChromeUIGpuHost,
   chrome::kChromeUIHistoryHost,
   chrome::kChromeUIIPCHost,
   chrome::kChromeUIMediaInternalsHost,
@@ -119,9 +119,6 @@ bool WillHandleBrowserAboutURL(GURL* url,
   // Replace cache with view-http-cache.
   if (host == chrome::kChromeUICacheHost) {
     host = chrome::kChromeUINetworkViewCacheHost;
-  // Replace gpu with gpu-internals.
-  } else if (host == chrome::kChromeUIGpuHost) {
-    host = chrome::kChromeUIGpuInternalsHost;
   // Replace sync with sync-internals (for legacy reasons).
   } else if (host == chrome::kChromeUISyncHost) {
     host = chrome::kChromeUISyncInternalsHost;
diff --git a/chrome/browser/browser_about_handler_unittest.cc b/chrome/browser/browser_about_handler_unittest.cc
index 4d52104..a7c1341 100644
--- a/chrome/browser/browser_about_handler_unittest.cc
+++ b/chrome/browser/browser_about_handler_unittest.cc
@@ -48,10 +48,6 @@ TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURL) {
         GURL(chrome_prefix + chrome::kChromeUINetworkViewCacheHost)
       },
       {
-        GURL(chrome_prefix + chrome::kChromeUIGpuHost),
-        GURL(chrome_prefix + chrome::kChromeUIGpuInternalsHost)
-      },
-      {
         GURL(chrome_prefix + chrome::kChromeUISignInInternalsHost),
         GURL(chrome_prefix + chrome::kChromeUISignInInternalsHost)
       },
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index c1e8463..62dc0a0 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -729,6 +729,7 @@ std::string LoginUtilsImpl::GetOffTheRecordCommandLine(
       ::switches::kDisableGpuWatchdog,
       ::switches::kDisableLoginAnimations,
       ::switches::kDisableOobeAnimation,
+      ::switches::kDisablePanelFitting,
       ::switches::kDisableThreadedCompositing,
       ::switches::kDisableSeccompFilterSandbox,
       ::switches::kDisableSeccompSandbox,
@@ -770,7 +771,6 @@ std::string LoginUtilsImpl::GetOffTheRecordCommandLine(
       ash::switches::kAshTouchHud,
       ash::switches::kAuraLegacyPowerButton,
       ash::switches::kAuraNoShadows,
-      ash::switches::kAshDisablePanelFitting,
       cc::switches::kDisableThreadedAnimation,
       cc::switches::kEnablePartialSwap,
       chromeos::switches::kDbusStub,
diff --git a/chrome/browser/resources/gpu_internals/browser_bridge.js b/chrome/browser/resources/gpu_internals/browser_bridge.js
index f474515..cb4133a 100644
--- a/chrome/browser/resources/gpu_internals/browser_bridge.js
+++ b/chrome/browser/resources/gpu_internals/browser_bridge.js
@@ -27,7 +27,6 @@ cr.define('gpu', function() {
       chrome.send('browserBridgeInitialized');
       this.beginRequestClientInfo_();
       this.beginRequestLogMessages_();
-      this.beginRequestCrashList_();
     }
   }
 
@@ -111,7 +110,7 @@ cr.define('gpu', function() {
     },
 
     /**
-     * Returns information about the currently runnign Chrome build.
+     * Returns information about the currently running Chrome build.
      */
     get clientInfo() {
       return this.clientInfo_;
@@ -140,28 +139,6 @@ cr.define('gpu', function() {
       return this.logMessages_;
     },
 
-    /**
-     * This function checks for previous crash list.
-     * If it's not available yet, a refresh is triggered.
-     */
-    beginRequestCrashList_: function() {
-      this.callAsync('requestCrashList', undefined, (function(data) {
-        if (data === undefined) { // try again in 250 ms
-          window.setTimeout(this.beginRequestCrashList_.bind(this), 250);
-        } else {
-          this.crashList_ = data;
-          cr.dispatchSimpleEvent(this, 'crashListChange');
-        }
-      }).bind(this));
-    },
-
-    /**
-     * Returns an array of log messages issued by the GPU process, if any.
-     */
-    get crashList() {
-      return this.crashList_;
-    }
-
   };
 
   return {
diff --git a/chrome/browser/resources/gpu_internals/browser_bridge_tests.js b/chrome/browser/resources/gpu_internals/browser_bridge_tests.js
index fec81d5..ebff6a7 100644
--- a/chrome/browser/resources/gpu_internals/browser_bridge_tests.js
+++ b/chrome/browser/resources/gpu_internals/browser_bridge_tests.js
@@ -257,11 +257,8 @@ var glValueArray = ['GL_ARB_compatibility',
        },
        clientInfo: {
          blacklist_version: '1.10',
-         cl: '80750-dirty',
          command_line: commandLineStr,
-         official: 'Developer Build',
-         version: '12.0.729.0',
-         version_mod: ''
+         version: 'Chrome/12.0.729.0',
        },
        logMessages: []
      },
diff --git a/chrome/browser/resources/gpu_internals/gpu_internals.html b/chrome/browser/resources/gpu_internals/gpu_internals.html
index 8acd3f2..8bb9030 100644
--- a/chrome/browser/resources/gpu_internals/gpu_internals.html
+++ b/chrome/browser/resources/gpu_internals/gpu_internals.html
@@ -41,28 +41,13 @@ tabbox tabpanels {
 <script src="chrome://resources/js/cr/ui/focus_outline_manager.js"></script>
 <script src="chrome://resources/js/cr/ui/tabs.js"></script>
 <script src="chrome://resources/js/util.js"></script>
-<script src="chrome://gpu-internals/gpu_internals.js"></script>
-<script src="chrome://gpu-internals/strings.js"></script>
+<script src="chrome://gpu/gpu_internals.js"></script>
+<script src="chrome://gpu/strings.js"></script>
 </head>
 <body>
   <div id="debug-div">
   </div>
-  <!-- Tabs -->
-  <tabbox id="main-tabs">
-    <tabs>
-      <tab>GPU Info</tab>
-      <tab>Profiling</tab>
-    </tabs>
-    <tabpanels>
-      <include src="info_view.html">
-      <tabpanel id="profiling-view-link">
-        <div>
-          Profiling view has moved to <a
-            href="chrome://tracing">chrome://tracing</a>.
-        </div>
-      </tabpanel>
-    </tabpanels>
-  </tabbox>
+  <include src="info_view.html">
   <script src="chrome://resources/js/i18n_template.js"></script>
   <script src="chrome://resources/js/i18n_process.js"></script>
   <script src="chrome://resources/js/jstemplate_compiled.js"></script>
diff --git a/chrome/browser/resources/gpu_internals/info_view.html b/chrome/browser/resources/gpu_internals/info_view.html
index 994acd8..b9ea809 100644
--- a/chrome/browser/resources/gpu_internals/info_view.html
+++ b/chrome/browser/resources/gpu_internals/info_view.html
@@ -36,15 +36,6 @@ found in the LICENSE file.
     <div id="diagnostics-table">None</div>
   </div>
 
-  <div id="crash-list" jsdisplay="values.length">
-    <h3>Crash List</h3>
-    <ul>
-      <li jsselect="values">
-        <span jscontent="id"></span>: <span jscontent="time"></span>
-      </li>
-    </ul>
-  </div>
-
   <div id="log-messages" jsdisplay="values.length">
     <h3>Log Messages</h3>
     <ul>
diff --git a/chrome/browser/resources/gpu_internals/info_view.js b/chrome/browser/resources/gpu_internals/info_view.js
index 88c8e0e..6e31e01 100644
--- a/chrome/browser/resources/gpu_internals/info_view.js
+++ b/chrome/browser/resources/gpu_internals/info_view.js
@@ -27,8 +27,6 @@ cr.define('gpu', function() {
                                      this.refresh.bind(this));
       browserBridge.addEventListener('clientInfoChange',
                                      this.refresh.bind(this));
-      browserBridge.addEventListener('crashListChange',
-                                     this.refresh.bind(this));
       this.refresh();
     },
 
@@ -39,10 +37,6 @@ cr.define('gpu', function() {
       // Client info
       if (browserBridge.clientInfo) {
         var clientInfo = browserBridge.clientInfo;
-        var chromeVersion = clientInfo.version +
-            ' (' + clientInfo.official +
-            ' ' + clientInfo.cl +
-            ') ' + clientInfo.version_mod;
         this.setTable_('client-info', [
           {
             description: 'Data exported',
@@ -50,7 +44,7 @@ cr.define('gpu', function() {
           },
           {
             description: 'Chrome version',
-            value: chromeVersion
+            value: clientInfo.version
           },
           {
             description: 'Operating system',
@@ -219,10 +213,6 @@ cr.define('gpu', function() {
         problemsDiv.hidden = true;
       }
 
-      // Crash list
-      jstProcess(new JsEvalContext({values: browserBridge.crashList}),
-                 $('crash-list'));
-
       // Log messages
       jstProcess(new JsEvalContext({values: browserBridge.logMessages}),
                  $('log-messages'));
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index aeea4a7a..869e22a 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -200,7 +200,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
     return &NewWebUI<ConstrainedWebDialogUI>;
   if (url.host() == chrome::kChromeUIFlagsHost)
     return &NewWebUI<FlagsUI>;
-  if (url.host() == chrome::kChromeUIGpuInternalsHost)
+  if (url.host() == chrome::kChromeUIGpuHost)
     return &NewWebUI<GpuInternalsUI>;
   if (url.host() == chrome::kChromeUIHistoryFrameHost)
     return &NewWebUI<HistoryUI>;
diff --git a/chrome/browser/ui/webui/gpu_internals_ui.cc b/chrome/browser/ui/webui/gpu_internals_ui.cc
index efc0663..f0b6e68 100644
--- a/chrome/browser/ui/webui/gpu_internals_ui.cc
+++ b/chrome/browser/ui/webui/gpu_internals_ui.cc
@@ -6,23 +6,14 @@
 
 #include <string>
 
-#if defined(OS_CHROMEOS)
-#include "ash/ash_switches.h"
-#endif
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
-#include "base/i18n/time_formatting.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/sys_info.h"
 #include "base/values.h"
 #include "cc/switches.h"
-#include "chrome/browser/crash_upload_list.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/crashes_ui.h"
-#include "chrome/common/chrome_version_info.h"
-#include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/compositor_util.h"
 #include "content/public/browser/gpu_data_manager.h"
@@ -31,13 +22,16 @@
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
+#include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/gpu_info.h"
+#include "content/public/common/url_constants.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "third_party/angle/src/common/version.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::BrowserContext;
 using content::BrowserThread;
 using content::GpuDataManager;
 using content::GpuFeatureType;
@@ -56,7 +50,7 @@ struct GpuFeatureInfo {
 
 content::WebUIDataSource* CreateGpuHTMLSource() {
   content::WebUIDataSource* source =
-      content::WebUIDataSource::Create(chrome::kChromeUIGpuInternalsHost);
+      content::WebUIDataSource::Create(chrome::kChromeUIGpuHost);
 
   source->SetJsonPath("strings.js");
   source->AddResourcePath("gpu_internals.js", IDR_GPU_INTERNALS_JS);
@@ -310,7 +304,7 @@ Value* GetFeatureStatus() {
           "panel_fitting",
           flags & content::GPU_FEATURE_TYPE_PANEL_FITTING,
 #if defined(OS_CHROMEOS)
-          command_line.HasSwitch(ash::switches::kAshDisablePanelFitting),
+          command_line.HasSwitch(switches::kDisablePanelFitting),
 #else
           true,
 #endif
@@ -445,8 +439,7 @@ Value* GetFeatureStatus() {
 class GpuMessageHandler
     : public WebUIMessageHandler,
       public base::SupportsWeakPtr<GpuMessageHandler>,
-      public content::GpuDataManagerObserver,
-      public CrashUploadList::Delegate {
+      public content::GpuDataManagerObserver {
  public:
   GpuMessageHandler();
   virtual ~GpuMessageHandler();
@@ -460,9 +453,6 @@ class GpuMessageHandler
       const content::GPUVideoMemoryUsageStats& video_memory_usage_stats)
           OVERRIDE {}
 
-  // CrashUploadList::Delegate implemenation.
-  virtual void OnCrashListAvailable() OVERRIDE;
-
   // Messages
   void OnBrowserBridgeInitialized(const ListValue* list);
   void OnCallAsync(const ListValue* list);
@@ -470,12 +460,8 @@ class GpuMessageHandler
   // Submessages dispatched from OnCallAsync
   Value* OnRequestClientInfo(const ListValue* list);
   Value* OnRequestLogMessages(const ListValue* list);
-  Value* OnRequestCrashList(const ListValue* list);
 
  private:
-  scoped_refptr<CrashUploadList> crash_list_;
-  bool crash_list_available_;
-
   // True if observing the GpuDataManager (re-attaching as observer would
   // DCHECK).
   bool observing_;
@@ -490,22 +476,17 @@ class GpuMessageHandler
 ////////////////////////////////////////////////////////////////////////////////
 
 GpuMessageHandler::GpuMessageHandler()
-    : crash_list_available_(false),
-      observing_(false) {
-  crash_list_ = CrashUploadList::Create(this);
+    : observing_(false) {
 }
 
 GpuMessageHandler::~GpuMessageHandler() {
   GpuDataManager::GetInstance()->RemoveObserver(this);
-  crash_list_->ClearDelegate();
 }
 
 /* BrowserBridge.callAsync prepends a requestID to these messages. */
 void GpuMessageHandler::RegisterMessages() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  crash_list_->LoadCrashListAsynchronously();
-
   web_ui()->RegisterMessageCallback("browserBridgeInitialized",
       base::Bind(&GpuMessageHandler::OnBrowserBridgeInitialized,
                  base::Unretained(this)));
@@ -542,8 +523,6 @@ void GpuMessageHandler::OnCallAsync(const ListValue* args) {
     ret = OnRequestClientInfo(submessageArgs);
   } else if (submessage == "requestLogMessages") {
     ret = OnRequestLogMessages(submessageArgs);
-  } else if (submessage == "requestCrashList") {
-    ret = OnRequestCrashList(submessageArgs);
   } else {  // unrecognized submessage
     NOTREACHED();
     delete submessageArgs;
@@ -585,26 +564,9 @@ Value* GpuMessageHandler::OnRequestClientInfo(const ListValue* list) {
 
   DictionaryValue* dict = new DictionaryValue();
 
-  chrome::VersionInfo version_info;
-
-  if (!version_info.is_valid()) {
-    DLOG(ERROR) << "Unable to create chrome::VersionInfo";
-  } else {
-    // We have everything we need to send the right values.
-    dict->SetString("version", version_info.Version());
-    dict->SetString("cl", version_info.LastChange());
-    dict->SetString("version_mod",
-        chrome::VersionInfo::GetVersionStringModifier());
-    dict->SetString("official",
-        l10n_util::GetStringUTF16(
-            version_info.IsOfficialBuild() ?
-            IDS_ABOUT_VERSION_OFFICIAL :
-            IDS_ABOUT_VERSION_UNOFFICIAL));
-
-    dict->SetString("command_line",
-        CommandLine::ForCurrentProcess()->GetCommandLineString());
-  }
-
+  dict->SetString("version", content::GetContentClient()->GetProduct());
+  dict->SetString("command_line",
+      CommandLine::ForCurrentProcess()->GetCommandLineString());
   dict->SetString("operating_system",
                   base::SysInfo::OperatingSystemName() + " " +
                   base::SysInfo::OperatingSystemVersion());
@@ -626,33 +588,6 @@ Value* GpuMessageHandler::OnRequestLogMessages(const ListValue*) {
   return GpuDataManager::GetInstance()->GetLogMessages();
 }
 
-Value* GpuMessageHandler::OnRequestCrashList(const ListValue*) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  if (!CrashesUI::CrashReportingEnabled()) {
-    // We need to return an empty list instead of NULL.
-    return new ListValue;
-  }
-  if (!crash_list_available_) {
-    // If we are still obtaining crash list, then return null so another
-    // request will be scheduled.
-    return NULL;
-  }
-
-  ListValue* list_value = new ListValue;
-  std::vector<CrashUploadList::CrashInfo> crashes;
-  crash_list_->GetUploadedCrashes(50, &crashes);
-  for (std::vector<CrashUploadList::CrashInfo>::iterator i = crashes.begin();
-       i != crashes.end(); ++i) {
-    DictionaryValue* crash = new DictionaryValue();
-    crash->SetString("id", i->crash_id);
-    crash->SetString("time",
-                     base::TimeFormatFriendlyDateAndTime(i->crash_time));
-    list_value->Append(crash);
-  }
-  return list_value;
-}
-
 void GpuMessageHandler::OnGpuInfoUpdate() {
   // Get GPU Info.
   scoped_ptr<base::DictionaryValue> gpu_info_val(
@@ -668,10 +603,6 @@ void GpuMessageHandler::OnGpuInfoUpdate() {
       *(gpu_info_val.get()));
 }
 
-void GpuMessageHandler::OnCrashListAvailable() {
-  crash_list_available_ = true;
-}
-
 }  // namespace
 
 
@@ -685,7 +616,8 @@ GpuInternalsUI::GpuInternalsUI(content::WebUI* web_ui)
     : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new GpuMessageHandler());
 
-  // Set up the chrome://gpu-internals/ source.
-  Profile* profile = Profile::FromWebUI(web_ui);
-  content::WebUIDataSource::Add(profile, CreateGpuHTMLSource());
+  // Set up the chrome://gpu/ source.
+  BrowserContext* browser_context =
+      web_ui->GetWebContents()->GetBrowserContext();
+  content::WebUIDataSource::Add(browser_context, CreateGpuHTMLSource());
 }
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index c0a781c..755e95f 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -151,8 +151,6 @@ const char kChromeUIFaviconHost[] = "favicon";
 const char kChromeUIFeedbackHost[] = "feedback";
 const char kChromeUIFlagsHost[] = "flags";
 const char kChromeUIFlashHost[] = "flash";
-const char kChromeUIGpuHost[] = "gpu";
-const char kChromeUIGpuInternalsHost[] = "gpu-internals";
 const char kChromeUIHangHost[] = "hang";
 const char kChromeUIHelpFrameHost[] = "help-frame";
 const char kChromeUIHelpHost[] = "help";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 616a48b..5c0710c 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -148,8 +148,6 @@ extern const char kChromeUIFlagsHost[];
 extern const char kChromeUIFlashHost[];
 extern const char kChromeUIHelpFrameHost[];
 extern const char kChromeUIHelpHost[];
-extern const char kChromeUIGpuHost[];
-extern const char kChromeUIGpuInternalsHost[];
 extern const char kChromeUIHangHost[];
 extern const char kChromeUIHistoryHost[];
 extern const char kChromeUIHistoryFrameHost[];
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index e19e8fd..8c2986f 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -728,6 +728,11 @@ const char kNetworkCountryIso[] = "network-country-iso";
 const char kEnableWebViewSynchronousAPIs[] = "enable-webview-synchronous-apis";
 #endif
 
+#if defined(OS_CHROMEOS)
+// Disables panel fitting (used for mirror mode).
+const char kDisablePanelFitting[]           = "disable-panel-fitting";
+#endif
+
 #if defined(OS_POSIX)
 // Causes the child processes to cleanly exit via calling exit().
 const char kChildCleanExit[]                = "child-clean-exit";
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index e7f1724..997d8a3 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -228,6 +228,10 @@ extern const char kNetworkCountryIso[];
 extern const char kEnableWebViewSynchronousAPIs[];
 #endif
 
+#if defined(OS_CHROMEOS)
+CONTENT_EXPORT extern const char kDisablePanelFitting[];
+#endif
+
 #if defined(OS_POSIX)
 extern const char kChildCleanExit[];
 #endif
diff --git a/content/public/common/url_constants.cc b/content/public/common/url_constants.cc
index 12f516f..12bea22 100644
--- a/content/public/common/url_constants.cc
+++ b/content/public/common/url_constants.cc
@@ -37,6 +37,7 @@ const char kChromeUIAppCacheInternalsHost[] = "appcache-internals";
 const char kChromeUIBlobInternalsHost[] = "blob-internals";
 const char kChromeUIBrowserCrashHost[] = "inducebrowsercrashforrealz";
 const char kChromeUIDevToolsHost[] = "devtools";
+const char kChromeUIGpuHost[] = "gpu";
 const char kChromeUIHistogramHost[] = "histograms";
 const char kChromeUINetworkViewCacheHost[] = "view-http-cache";
 const char kChromeUIResourcesHost[] = "resources";
diff --git a/content/public/common/url_constants.h b/content/public/common/url_constants.h
index b1b59a2..02fb22d 100644
--- a/content/public/common/url_constants.h
+++ b/content/public/common/url_constants.h
@@ -29,6 +29,7 @@ CONTENT_EXPORT extern const char kFileScheme[];
 CONTENT_EXPORT extern const char kFileSystemScheme[];
 CONTENT_EXPORT extern const char kFtpScheme[];
 CONTENT_EXPORT extern const char kGuestScheme[];
+CONTENT_EXPORT extern const char kChromeUIGpuHost[];
 CONTENT_EXPORT extern const char kHttpScheme[];
 CONTENT_EXPORT extern const char kHttpsScheme[];
 CONTENT_EXPORT extern const char kJavaScriptScheme[];