mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-28 05:10:49 +00:00
Sync Chimera changes with CHIMERA_M1_0_1_BRANCH (bug 161668). In addition to landing all the Chimera-specific changes here, I'm creating a new chimera.js file with our Chimera-specific prefs (and moving them out of all.js). r=brade.
This commit is contained in:
bryner%netscape.com
parent
cf0278de93
commit
2b204d8d7f
@ -4792,6 +4792,23 @@
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F59A0E320307635401A967F3 = {
|
||||
isa = PBXFileReference;
|
||||
path = chimera.js;
|
||||
refType = 2;
|
||||
};
|
||||
F59A0E350307639801A967F3 = {
|
||||
fileRef = F59A0E320307635401A967F3;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F59A0E360307639801A967F3 = {
|
||||
fileRef = F59A0E320307635401A967F3;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F59E9F3D0237E28401A967DF = {
|
||||
isa = PBXFileReference;
|
||||
path = ContentClickListener.h;
|
||||
@ -7044,6 +7061,7 @@
|
||||
dstSubfolderSpec = 6;
|
||||
files = (
|
||||
F5BAAC2002AC69DA01A967F3,
|
||||
F59A0E360307639801A967F3,
|
||||
F5C2793A02C515F2010000E1,
|
||||
F5C2793B02C515F2010000E1,
|
||||
F5BAAC2102AC69DA01A967F3,
|
||||
@ -9649,6 +9667,7 @@
|
||||
F5C2793102C514FF010000E1,
|
||||
F5C2793202C514FF010000E1,
|
||||
F55A9BC60228CCE101DAE4DB,
|
||||
F59A0E320307635401A967F3,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = "Gecko Pref Defaults";
|
||||
@ -9745,6 +9764,7 @@
|
||||
dstSubfolderSpec = 6;
|
||||
files = (
|
||||
F6BD652001B3184301A962F7,
|
||||
F59A0E350307639801A967F3,
|
||||
F5C2793702C5158B010000E1,
|
||||
F5C2793802C5158B010000E1,
|
||||
F55A9BC70228CCE201DAE4DB,
|
||||
|
||||
57
camino/chimera.js
Normal file
57
camino/chimera.js
Normal file
@ -0,0 +1,57 @@
|
||||
/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is Chimera.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2002
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Brian Ryner <bryner@netscape.com>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
// This file contains Chimera-specific default preferences.
|
||||
|
||||
// What to load in a new tab: 0 = blank, 1 = homepage, 2 = last page
|
||||
pref("browser.tabs.startPage", 0);
|
||||
|
||||
// Disable the print progress dialog
|
||||
pref("print.show_print_progress", false);
|
||||
|
||||
// Pick some reasonable OS X default fonts
|
||||
pref("font.name.serif.x-western", "Lucida Grande");
|
||||
pref("font.name.sans-serif.x-western", "Lucida Grande");
|
||||
pref("font.size.variable.x-western", 15);
|
||||
pref("font.size.fixed.x-western", 12);
|
||||
pref("font.size.minimum-size.x-western", 10);
|
||||
|
||||
// Unsuppress painting sooner (XXXbryner, why is this here?)
|
||||
pref("nglayout.initialpaint.delay", 250);
|
||||
|
||||
|
||||
@ -4792,6 +4792,23 @@
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F59A0E320307635401A967F3 = {
|
||||
isa = PBXFileReference;
|
||||
path = chimera.js;
|
||||
refType = 2;
|
||||
};
|
||||
F59A0E350307639801A967F3 = {
|
||||
fileRef = F59A0E320307635401A967F3;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F59A0E360307639801A967F3 = {
|
||||
fileRef = F59A0E320307635401A967F3;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F59E9F3D0237E28401A967DF = {
|
||||
isa = PBXFileReference;
|
||||
path = ContentClickListener.h;
|
||||
@ -7044,6 +7061,7 @@
|
||||
dstSubfolderSpec = 6;
|
||||
files = (
|
||||
F5BAAC2002AC69DA01A967F3,
|
||||
F59A0E360307639801A967F3,
|
||||
F5C2793A02C515F2010000E1,
|
||||
F5C2793B02C515F2010000E1,
|
||||
F5BAAC2102AC69DA01A967F3,
|
||||
@ -9649,6 +9667,7 @@
|
||||
F5C2793102C514FF010000E1,
|
||||
F5C2793202C514FF010000E1,
|
||||
F55A9BC60228CCE101DAE4DB,
|
||||
F59A0E320307635401A967F3,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = "Gecko Pref Defaults";
|
||||
@ -9745,6 +9764,7 @@
|
||||
dstSubfolderSpec = 6;
|
||||
files = (
|
||||
F6BD652001B3184301A962F7,
|
||||
F59A0E350307639801A967F3,
|
||||
F5C2793702C5158B010000E1,
|
||||
F5C2793802C5158B010000E1,
|
||||
F55A9BC70228CCE201DAE4DB,
|
||||
|
||||
57
camino/resources/application/chimera.js
Normal file
57
camino/resources/application/chimera.js
Normal file
@ -0,0 +1,57 @@
|
||||
/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is Chimera.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2002
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Brian Ryner <bryner@netscape.com>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
// This file contains Chimera-specific default preferences.
|
||||
|
||||
// What to load in a new tab: 0 = blank, 1 = homepage, 2 = last page
|
||||
pref("browser.tabs.startPage", 0);
|
||||
|
||||
// Disable the print progress dialog
|
||||
pref("print.show_print_progress", false);
|
||||
|
||||
// Pick some reasonable OS X default fonts
|
||||
pref("font.name.serif.x-western", "Lucida Grande");
|
||||
pref("font.name.sans-serif.x-western", "Lucida Grande");
|
||||
pref("font.size.variable.x-western", 15);
|
||||
pref("font.size.fixed.x-western", 12);
|
||||
pref("font.size.minimum-size.x-western", 10);
|
||||
|
||||
// Unsuppress painting sooner (XXXbryner, why is this here?)
|
||||
pref("nglayout.initialpaint.delay", 250);
|
||||
|
||||
|
||||
@ -4792,6 +4792,23 @@
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F59A0E320307635401A967F3 = {
|
||||
isa = PBXFileReference;
|
||||
path = chimera.js;
|
||||
refType = 2;
|
||||
};
|
||||
F59A0E350307639801A967F3 = {
|
||||
fileRef = F59A0E320307635401A967F3;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F59A0E360307639801A967F3 = {
|
||||
fileRef = F59A0E320307635401A967F3;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F59E9F3D0237E28401A967DF = {
|
||||
isa = PBXFileReference;
|
||||
path = ContentClickListener.h;
|
||||
@ -7044,6 +7061,7 @@
|
||||
dstSubfolderSpec = 6;
|
||||
files = (
|
||||
F5BAAC2002AC69DA01A967F3,
|
||||
F59A0E360307639801A967F3,
|
||||
F5C2793A02C515F2010000E1,
|
||||
F5C2793B02C515F2010000E1,
|
||||
F5BAAC2102AC69DA01A967F3,
|
||||
@ -9649,6 +9667,7 @@
|
||||
F5C2793102C514FF010000E1,
|
||||
F5C2793202C514FF010000E1,
|
||||
F55A9BC60228CCE101DAE4DB,
|
||||
F59A0E320307635401A967F3,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = "Gecko Pref Defaults";
|
||||
@ -9745,6 +9764,7 @@
|
||||
dstSubfolderSpec = 6;
|
||||
files = (
|
||||
F6BD652001B3184301A962F7,
|
||||
F59A0E350307639801A967F3,
|
||||
F5C2793702C5158B010000E1,
|
||||
F5C2793802C5158B010000E1,
|
||||
F55A9BC70228CCE201DAE4DB,
|
||||
|
||||
57
chimera/chimera.js
Normal file
57
chimera/chimera.js
Normal file
@ -0,0 +1,57 @@
|
||||
/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is Chimera.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2002
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Brian Ryner <bryner@netscape.com>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
// This file contains Chimera-specific default preferences.
|
||||
|
||||
// What to load in a new tab: 0 = blank, 1 = homepage, 2 = last page
|
||||
pref("browser.tabs.startPage", 0);
|
||||
|
||||
// Disable the print progress dialog
|
||||
pref("print.show_print_progress", false);
|
||||
|
||||
// Pick some reasonable OS X default fonts
|
||||
pref("font.name.serif.x-western", "Lucida Grande");
|
||||
pref("font.name.sans-serif.x-western", "Lucida Grande");
|
||||
pref("font.size.variable.x-western", 15);
|
||||
pref("font.size.fixed.x-western", 12);
|
||||
pref("font.size.minimum-size.x-western", 10);
|
||||
|
||||
// Unsuppress painting sooner (XXXbryner, why is this here?)
|
||||
pref("nglayout.initialpaint.delay", 250);
|
||||
|
||||
|
||||
@ -4792,6 +4792,23 @@
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F59A0E320307635401A967F3 = {
|
||||
isa = PBXFileReference;
|
||||
path = chimera.js;
|
||||
refType = 2;
|
||||
};
|
||||
F59A0E350307639801A967F3 = {
|
||||
fileRef = F59A0E320307635401A967F3;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F59A0E360307639801A967F3 = {
|
||||
fileRef = F59A0E320307635401A967F3;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
F59E9F3D0237E28401A967DF = {
|
||||
isa = PBXFileReference;
|
||||
path = ContentClickListener.h;
|
||||
@ -7044,6 +7061,7 @@
|
||||
dstSubfolderSpec = 6;
|
||||
files = (
|
||||
F5BAAC2002AC69DA01A967F3,
|
||||
F59A0E360307639801A967F3,
|
||||
F5C2793A02C515F2010000E1,
|
||||
F5C2793B02C515F2010000E1,
|
||||
F5BAAC2102AC69DA01A967F3,
|
||||
@ -9649,6 +9667,7 @@
|
||||
F5C2793102C514FF010000E1,
|
||||
F5C2793202C514FF010000E1,
|
||||
F55A9BC60228CCE101DAE4DB,
|
||||
F59A0E320307635401A967F3,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = "Gecko Pref Defaults";
|
||||
@ -9745,6 +9764,7 @@
|
||||
dstSubfolderSpec = 6;
|
||||
files = (
|
||||
F6BD652001B3184301A962F7,
|
||||
F59A0E350307639801A967F3,
|
||||
F5C2793702C5158B010000E1,
|
||||
F5C2793802C5158B010000E1,
|
||||
F55A9BC70228CCE201DAE4DB,
|
||||
|
||||
57
chimera/resources/application/chimera.js
Normal file
57
chimera/resources/application/chimera.js
Normal file
@ -0,0 +1,57 @@
|
||||
/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is Chimera.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2002
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Brian Ryner <bryner@netscape.com>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
// This file contains Chimera-specific default preferences.
|
||||
|
||||
// What to load in a new tab: 0 = blank, 1 = homepage, 2 = last page
|
||||
pref("browser.tabs.startPage", 0);
|
||||
|
||||
// Disable the print progress dialog
|
||||
pref("print.show_print_progress", false);
|
||||
|
||||
// Pick some reasonable OS X default fonts
|
||||
pref("font.name.serif.x-western", "Lucida Grande");
|
||||
pref("font.name.sans-serif.x-western", "Lucida Grande");
|
||||
pref("font.size.variable.x-western", 15);
|
||||
pref("font.size.fixed.x-western", 12);
|
||||
pref("font.size.minimum-size.x-western", 10);
|
||||
|
||||
// Unsuppress painting sooner (XXXbryner, why is this here?)
|
||||
pref("nglayout.initialpaint.delay", 250);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user