1 |
diff -p -up chromium-14.0.794.0/chrome/browser/resources/options/options.html.exclude-chromeos-options chromium-14.0.794.0/chrome/browser/resources/options/options.html |
2 |
--- chromium-14.0.794.0/chrome/browser/resources/options/options.html.exclude-chromeos-options 2011-07-28 13:38:38.000000000 +0000 |
3 |
+++ chromium-14.0.794.0/chrome/browser/resources/options/options.html 2011-07-28 13:41:03.000000000 +0000 |
4 |
@@ -38,14 +38,6 @@ |
5 |
<link rel="stylesheet" href="search_page.css"> |
6 |
<link rel="stylesheet" href="subpages_tab_controls.css"> |
7 |
<link rel="stylesheet" href="../sync_setup_overlay.css"> |
8 |
-<if expr="pp_ifdef('chromeos')"> |
9 |
- <link rel="stylesheet" href="about_page.css"> |
10 |
- <link rel="stylesheet" href="chromeos/accounts_options_page.css"> |
11 |
- <link rel="stylesheet" href="chromeos/change_picture_options.css"> |
12 |
- <link rel="stylesheet" href="chromeos/internet_options_page.css"> |
13 |
- <link rel="stylesheet" href="chromeos/proxy.css"> |
14 |
- <link rel="stylesheet" href="chromeos/system_options_page.css"> |
15 |
-</if> |
16 |
|
17 |
<if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')"> |
18 |
<link rel="stylesheet" href="certificate_manager.css"> |
19 |
@@ -83,11 +75,6 @@ |
20 |
<include src="language_add_language_overlay.html"> |
21 |
<include src="manage_profile_overlay.html"> |
22 |
<include src="../sync_setup_overlay.html"> |
23 |
- <if expr="pp_ifdef('chromeos')"> |
24 |
- <include |
25 |
- src="chromeos/language_customize_modifier_keys_overlay.html"> |
26 |
- <include src="chromeos/internet_detail.html"> |
27 |
- </if> |
28 |
<if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')"> |
29 |
<include src="certificate_restore_overlay.html"> |
30 |
<include src="certificate_backup_overlay.html"> |
31 |
@@ -114,11 +101,6 @@ |
32 |
<include src="search_page.html"> |
33 |
<include src="browser_options.html"> |
34 |
<include src="personal_options.html"> |
35 |
- <if expr="pp_ifdef('chromeos')"> |
36 |
- <include src="chromeos/system_options.html"> |
37 |
- <include src="chromeos/internet_options.html"> |
38 |
- <include src="chromeos/accounts_options.html"> |
39 |
- </if> |
40 |
<include src="advanced_options.html"> |
41 |
</div> |
42 |
<div id="subpage-sheet-container-1" |
43 |
@@ -126,11 +108,6 @@ |
44 |
<div id="subpage-sheet-1" class="subpage-sheet"> |
45 |
<button class="raw-button close-subpage"></button> |
46 |
<div class="subpage-sheet-contents"> |
47 |
- <if expr="pp_ifdef('chromeos')"> |
48 |
- <include src="about_page.html"> |
49 |
- <include src="chromeos/change_picture_options.html"> |
50 |
- <include src="chromeos/proxy.html"> |
51 |
- </if> |
52 |
<if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')"> |
53 |
<include src="certificate_manager.html"> |
54 |
</if> |
55 |
@@ -148,12 +125,6 @@ |
56 |
<div id="subpage-sheet-2" class="subpage-sheet"> |
57 |
<button class="raw-button close-subpage"></button> |
58 |
<div class="subpage-sheet-contents"> |
59 |
- <if expr="pp_ifdef('chromeos')"> |
60 |
- <include src="chromeos/language_chewing_options.html"> |
61 |
- <include src="chromeos/language_hangul_options.html"> |
62 |
- <include src="chromeos/language_mozc_options.html"> |
63 |
- <include src="chromeos/language_pinyin_options.html"> |
64 |
- </if> |
65 |
<include src="cookies_view.html"> |
66 |
<if expr="pp_ifdef('enable_register_protocol_handler')"> |
67 |
<include src="handler_options.html"> |
68 |
diff -p -up chromium-14.0.794.0/chrome/browser/resources/options/options_bundle.js.exclude-chromeos-options chromium-14.0.794.0/chrome/browser/resources/options/options_bundle.js |
69 |
--- chromium-14.0.794.0/chrome/browser/resources/options/options_bundle.js.exclude-chromeos-options 2011-07-28 13:38:38.000000000 +0000 |
70 |
+++ chromium-14.0.794.0/chrome/browser/resources/options/options_bundle.js 2011-07-28 13:38:43.000000000 +0000 |
71 |
@@ -10,27 +10,6 @@ |
72 |
<include src="deletable_item_list.js"></include> |
73 |
<include src="inline_editable_list.js"></include> |
74 |
<include src="options_page.js"></include> |
75 |
-<if expr="pp_ifdef('chromeos')"> |
76 |
- <include src="about_page.js"></include> |
77 |
- <include src="chromeos/cellular_plan_element.js"></include> |
78 |
- <include src="chromeos/change_picture_options.js"></include> |
79 |
- <include src="chromeos/internet_detail_ip_config_list.js"></include> |
80 |
- <include src="chromeos/internet_network_element.js"></include> |
81 |
- <include src="chromeos/internet_options.js"></include> |
82 |
- <include src="chromeos/internet_detail.js"></include> |
83 |
- <include src="chromeos/system_options.js"></include> |
84 |
- <include src="chromeos/accounts_options.js"></include> |
85 |
- <include src="chromeos/proxy_options.js"></include> |
86 |
- <include src="chromeos/proxy_rules_list.js"></include> |
87 |
- <include src="chromeos/accounts_user_list.js"></include> |
88 |
- <include src="chromeos/accounts_user_name_edit.js"></include> |
89 |
- var AboutPage = options.AboutPage; |
90 |
- var AccountsOptions = options.AccountsOptions; |
91 |
- var ChangePictureOptions = options.ChangePictureOptions; |
92 |
- var InternetOptions = options.InternetOptions; |
93 |
- var DetailsInternetPage = options.internet.DetailsInternetPage; |
94 |
- var SystemOptions = options.SystemOptions; |
95 |
-</if> |
96 |
<if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')"> |
97 |
<include src="certificate_tree.js"></include> |
98 |
<include src="certificate_manager.js"></include> |