Merge 64807 & 64824 - Cloud Print Dialog work

chrome/common/pref_names.h

 // Copyright (c) 2010 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.
 
 // Constants for the names of various preferences, for easier changing.
 
 #ifndef CHROME_COMMON_PREF_NAMES_H_
 #define CHROME_COMMON_PREF_NAMES_H_
 #pragma once
 
@@ skipping 354 matching lines @@
 extern const char kWebAppCreateOnDesktop[];
 extern const char kWebAppCreateInAppsMenu[];
 extern const char kWebAppCreateInQuickLaunchBar[];
 
 extern const char kGeolocationAccessToken[];
 extern const char kGeolocationDefaultContentSetting[];
 extern const char kGeolocationContentSettings[];
 
 extern const char kLoginDatabaseMigrated[];
 
+extern const char kCloudPrintServiceURL[];
+extern const char kCloudPrintDialogWidth[];
+extern const char kCloudPrintDialogHeight[];
 extern const char kCloudPrintProxyEnabled[];
-extern const char kCloudPrintServiceURL[];
 extern const char kCloudPrintProxyId[];
 extern const char kCloudPrintAuthToken[];
 extern const char kCloudPrintXMPPAuthToken[];
 extern const char kCloudPrintEmail[];
 extern const char kCloudPrintPrintSystemSettings[];
 
 extern const char kRemotingHasSetupCompleted[];
 extern const char kRemotingHostEnabled[];
 
 extern const char kNoProxyServer[];
 extern const char kProxyAutoDetect[];
 extern const char kProxyServer[];
 extern const char kProxyPacUrl[];
 extern const char kProxyBypassList[];
 
 #if defined(OS_CHROMEOS)
 extern const char kSignedSettingsTempStorage[];
 #endif
 
 extern const char kRegisteredBackgroundContents[];
 
 }  // namespace prefs
 
 #endif  // CHROME_COMMON_PREF_NAMES_H_