diff options
163 files changed, 624 insertions, 624 deletions
diff --git a/chrome/app/theme/app_launcher_button.png b/chrome/app/theme/app_launcher_button.png Binary files differindex 7dba348..7dba348 100755..100644 --- a/chrome/app/theme/app_launcher_button.png +++ b/chrome/app/theme/app_launcher_button.png diff --git a/chrome/app/theme/back_Template.pdf b/chrome/app/theme/back_Template.pdf index 103af58..103af58 100755..100644 --- a/chrome/app/theme/back_Template.pdf +++ b/chrome/app/theme/back_Template.pdf diff --git a/chrome/app/theme/find_next_Template.pdf b/chrome/app/theme/find_next_Template.pdf index e272fc9..e272fc9 100755..100644 --- a/chrome/app/theme/find_next_Template.pdf +++ b/chrome/app/theme/find_next_Template.pdf diff --git a/chrome/app/theme/find_prev_Template.pdf b/chrome/app/theme/find_prev_Template.pdf index a9d41d6..a9d41d6 100755..100644 --- a/chrome/app/theme/find_prev_Template.pdf +++ b/chrome/app/theme/find_prev_Template.pdf diff --git a/chrome/app/theme/forward_Template.pdf b/chrome/app/theme/forward_Template.pdf index cebe093..cebe093 100755..100644 --- a/chrome/app/theme/forward_Template.pdf +++ b/chrome/app/theme/forward_Template.pdf diff --git a/chrome/app/theme/go_Template.pdf b/chrome/app/theme/go_Template.pdf index e863e13..e863e13 100755..100644 --- a/chrome/app/theme/go_Template.pdf +++ b/chrome/app/theme/go_Template.pdf diff --git a/chrome/app/theme/home_Template.pdf b/chrome/app/theme/home_Template.pdf index 407203c..407203c 100755..100644 --- a/chrome/app/theme/home_Template.pdf +++ b/chrome/app/theme/home_Template.pdf diff --git a/chrome/app/theme/login_default.png b/chrome/app/theme/login_default.png Binary files differindex 84cca96..84cca96 100755..100644 --- a/chrome/app/theme/login_default.png +++ b/chrome/app/theme/login_default.png diff --git a/chrome/app/theme/login_other.png b/chrome/app/theme/login_other.png Binary files differindex 452749b..452749b 100755..100644 --- a/chrome/app/theme/login_other.png +++ b/chrome/app/theme/login_other.png diff --git a/chrome/app/theme/mediaplayer_playlist.png b/chrome/app/theme/mediaplayer_playlist.png Binary files differindex ec8e1be..ec8e1be 100755..100644 --- a/chrome/app/theme/mediaplayer_playlist.png +++ b/chrome/app/theme/mediaplayer_playlist.png diff --git a/chrome/app/theme/menu_chrome_Template.pdf b/chrome/app/theme/menu_chrome_Template.pdf index 62c6f8c..62c6f8c 100755..100644 --- a/chrome/app/theme/menu_chrome_Template.pdf +++ b/chrome/app/theme/menu_chrome_Template.pdf diff --git a/chrome/app/theme/menu_chrome_rtl_Template.pdf b/chrome/app/theme/menu_chrome_rtl_Template.pdf index ed8c936..ed8c936 100755..100644 --- a/chrome/app/theme/menu_chrome_rtl_Template.pdf +++ b/chrome/app/theme/menu_chrome_rtl_Template.pdf diff --git a/chrome/app/theme/menu_page_Template.pdf b/chrome/app/theme/menu_page_Template.pdf index 30cb0c1..30cb0c1 100755..100644 --- a/chrome/app/theme/menu_page_Template.pdf +++ b/chrome/app/theme/menu_page_Template.pdf diff --git a/chrome/app/theme/menu_page_rtl_Template.pdf b/chrome/app/theme/menu_page_rtl_Template.pdf index 3029446..3029446 100755..100644 --- a/chrome/app/theme/menu_page_rtl_Template.pdf +++ b/chrome/app/theme/menu_page_rtl_Template.pdf diff --git a/chrome/app/theme/omnibox_history.pdf b/chrome/app/theme/omnibox_history.pdf index 9b7e3f6..9b7e3f6 100755..100644 --- a/chrome/app/theme/omnibox_history.pdf +++ b/chrome/app/theme/omnibox_history.pdf diff --git a/chrome/app/theme/omnibox_http.pdf b/chrome/app/theme/omnibox_http.pdf index 2055179..2055179 100755..100644 --- a/chrome/app/theme/omnibox_http.pdf +++ b/chrome/app/theme/omnibox_http.pdf diff --git a/chrome/app/theme/omnibox_https_invalid.pdf b/chrome/app/theme/omnibox_https_invalid.pdf index b692658..b692658 100755..100644 --- a/chrome/app/theme/omnibox_https_invalid.pdf +++ b/chrome/app/theme/omnibox_https_invalid.pdf diff --git a/chrome/app/theme/omnibox_https_valid.pdf b/chrome/app/theme/omnibox_https_valid.pdf index 0eb2893..0eb2893 100755..100644 --- a/chrome/app/theme/omnibox_https_valid.pdf +++ b/chrome/app/theme/omnibox_https_valid.pdf diff --git a/chrome/app/theme/omnibox_https_warning.pdf b/chrome/app/theme/omnibox_https_warning.pdf index 93c7d63..93c7d63 100755..100644 --- a/chrome/app/theme/omnibox_https_warning.pdf +++ b/chrome/app/theme/omnibox_https_warning.pdf diff --git a/chrome/app/theme/omnibox_more.pdf b/chrome/app/theme/omnibox_more.pdf index 5be83f8..5be83f8 100755..100644 --- a/chrome/app/theme/omnibox_more.pdf +++ b/chrome/app/theme/omnibox_more.pdf diff --git a/chrome/app/theme/omnibox_search.pdf b/chrome/app/theme/omnibox_search.pdf index 91d8953..91d8953 100755..100644 --- a/chrome/app/theme/omnibox_search.pdf +++ b/chrome/app/theme/omnibox_search.pdf diff --git a/chrome/app/theme/omnibox_star.pdf b/chrome/app/theme/omnibox_star.pdf index 14ba712..14ba712 100755..100644 --- a/chrome/app/theme/omnibox_star.pdf +++ b/chrome/app/theme/omnibox_star.pdf diff --git a/chrome/app/theme/omnibox_star_lit.pdf b/chrome/app/theme/omnibox_star_lit.pdf index a6aa7b4..a6aa7b4 100755..100644 --- a/chrome/app/theme/omnibox_star_lit.pdf +++ b/chrome/app/theme/omnibox_star_lit.pdf diff --git a/chrome/app/theme/reload_Template.pdf b/chrome/app/theme/reload_Template.pdf index 451b242..451b242 100755..100644 --- a/chrome/app/theme/reload_Template.pdf +++ b/chrome/app/theme/reload_Template.pdf diff --git a/chrome/app/theme/stop_Template.pdf b/chrome/app/theme/stop_Template.pdf index 6f3b455..6f3b455 100755..100644 --- a/chrome/app/theme/stop_Template.pdf +++ b/chrome/app/theme/stop_Template.pdf diff --git a/chrome/app/theme/tab_alpha_new_tab.png b/chrome/app/theme/tab_alpha_new_tab.png Binary files differindex 6d77135..6d77135 100755..100644 --- a/chrome/app/theme/tab_alpha_new_tab.png +++ b/chrome/app/theme/tab_alpha_new_tab.png diff --git a/chrome/app/theme/tab_new_tab_shadow.png b/chrome/app/theme/tab_new_tab_shadow.png Binary files differindex 989d591..989d591 100755..100644 --- a/chrome/app/theme/tab_new_tab_shadow.png +++ b/chrome/app/theme/tab_new_tab_shadow.png diff --git a/chrome/browser/chromeos/DEPS b/chrome/browser/chromeos/DEPS index 2c963d1..2c963d1 100755..100644 --- a/chrome/browser/chromeos/DEPS +++ b/chrome/browser/chromeos/DEPS diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc index 533384f..533384f 100755..100644 --- a/chrome/browser/debugger/devtools_window.cc +++ b/chrome/browser/debugger/devtools_window.cc diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/debugger/devtools_window.h index f799639..f799639 100755..100644 --- a/chrome/browser/debugger/devtools_window.h +++ b/chrome/browser/debugger/devtools_window.h diff --git a/chrome/browser/extensions/extension_install_ui.h b/chrome/browser/extensions/extension_install_ui.h index e99a7ac..e99a7ac 100755..100644 --- a/chrome/browser/extensions/extension_install_ui.h +++ b/chrome/browser/extensions/extension_install_ui.h diff --git a/chrome/browser/geolocation/geolocation_content_settings_map.cc b/chrome/browser/geolocation/geolocation_content_settings_map.cc index da9739d..da9739d 100755..100644 --- a/chrome/browser/geolocation/geolocation_content_settings_map.cc +++ b/chrome/browser/geolocation/geolocation_content_settings_map.cc diff --git a/chrome/browser/geolocation/geolocation_content_settings_map.h b/chrome/browser/geolocation/geolocation_content_settings_map.h index a5512de..a5512de 100755..100644 --- a/chrome/browser/geolocation/geolocation_content_settings_map.h +++ b/chrome/browser/geolocation/geolocation_content_settings_map.h diff --git a/chrome/browser/geolocation/geolocation_content_settings_map_unittest.cc b/chrome/browser/geolocation/geolocation_content_settings_map_unittest.cc index defba3a..defba3a 100755..100644 --- a/chrome/browser/geolocation/geolocation_content_settings_map_unittest.cc +++ b/chrome/browser/geolocation/geolocation_content_settings_map_unittest.cc diff --git a/chrome/browser/resources/about_os_credits.html b/chrome/browser/resources/about_os_credits.html index 29be803..29be803 100755..100644 --- a/chrome/browser/resources/about_os_credits.html +++ b/chrome/browser/resources/about_os_credits.html diff --git a/chrome/browser/resources/calendar_app/128.png b/chrome/browser/resources/calendar_app/128.png Binary files differindex 986546c..986546c 100755..100644 --- a/chrome/browser/resources/calendar_app/128.png +++ b/chrome/browser/resources/calendar_app/128.png diff --git a/chrome/browser/resources/calendar_app/24.png b/chrome/browser/resources/calendar_app/24.png Binary files differindex fc81a8a..fc81a8a 100755..100644 --- a/chrome/browser/resources/calendar_app/24.png +++ b/chrome/browser/resources/calendar_app/24.png diff --git a/chrome/browser/resources/calendar_app/32.png b/chrome/browser/resources/calendar_app/32.png Binary files differindex 1aa0c95..1aa0c95 100755..100644 --- a/chrome/browser/resources/calendar_app/32.png +++ b/chrome/browser/resources/calendar_app/32.png diff --git a/chrome/browser/resources/calendar_app/48.png b/chrome/browser/resources/calendar_app/48.png Binary files differindex cbb58e6..cbb58e6 100755..100644 --- a/chrome/browser/resources/calendar_app/48.png +++ b/chrome/browser/resources/calendar_app/48.png diff --git a/chrome/browser/resources/docs_app/128.png b/chrome/browser/resources/docs_app/128.png Binary files differindex 9b053c3..9b053c3 100755..100644 --- a/chrome/browser/resources/docs_app/128.png +++ b/chrome/browser/resources/docs_app/128.png diff --git a/chrome/browser/resources/docs_app/24.png b/chrome/browser/resources/docs_app/24.png Binary files differindex fefe7f5..fefe7f5 100755..100644 --- a/chrome/browser/resources/docs_app/24.png +++ b/chrome/browser/resources/docs_app/24.png diff --git a/chrome/browser/resources/docs_app/32.png b/chrome/browser/resources/docs_app/32.png Binary files differindex 95db1d6..95db1d6 100755..100644 --- a/chrome/browser/resources/docs_app/32.png +++ b/chrome/browser/resources/docs_app/32.png diff --git a/chrome/browser/resources/docs_app/48.png b/chrome/browser/resources/docs_app/48.png Binary files differindex 81899e1..81899e1 100755..100644 --- a/chrome/browser/resources/docs_app/48.png +++ b/chrome/browser/resources/docs_app/48.png diff --git a/chrome/browser/resources/gmail_app/128.png b/chrome/browser/resources/gmail_app/128.png Binary files differindex 121db78..121db78 100755..100644 --- a/chrome/browser/resources/gmail_app/128.png +++ b/chrome/browser/resources/gmail_app/128.png diff --git a/chrome/browser/resources/gmail_app/24.png b/chrome/browser/resources/gmail_app/24.png Binary files differindex 4f0f0e8..4f0f0e8 100755..100644 --- a/chrome/browser/resources/gmail_app/24.png +++ b/chrome/browser/resources/gmail_app/24.png diff --git a/chrome/browser/resources/gmail_app/32.png b/chrome/browser/resources/gmail_app/32.png Binary files differindex a0706d5..a0706d5 100755..100644 --- a/chrome/browser/resources/gmail_app/32.png +++ b/chrome/browser/resources/gmail_app/32.png diff --git a/chrome/browser/resources/gmail_app/48.png b/chrome/browser/resources/gmail_app/48.png Binary files differindex 7dfa7bd..7dfa7bd 100755..100644 --- a/chrome/browser/resources/gmail_app/48.png +++ b/chrome/browser/resources/gmail_app/48.png diff --git a/chrome/browser/resources/notification_1line.html b/chrome/browser/resources/notification_1line.html index 6ebebb5..6ebebb5 100755..100644 --- a/chrome/browser/resources/notification_1line.html +++ b/chrome/browser/resources/notification_1line.html diff --git a/chrome/browser/resources/notification_2line.html b/chrome/browser/resources/notification_2line.html index a5695b0..a5695b0 100755..100644 --- a/chrome/browser/resources/notification_2line.html +++ b/chrome/browser/resources/notification_2line.html diff --git a/chrome/browser/resources/notification_icon.html b/chrome/browser/resources/notification_icon.html index 82d9112..82d9112 100755..100644 --- a/chrome/browser/resources/notification_icon.html +++ b/chrome/browser/resources/notification_icon.html diff --git a/chrome/browser/sync/engine/store_timestamps_command.cc b/chrome/browser/sync/engine/store_timestamps_command.cc index 9022152..9022152 100755..100644 --- a/chrome/browser/sync/engine/store_timestamps_command.cc +++ b/chrome/browser/sync/engine/store_timestamps_command.cc diff --git a/chrome/browser/sync/engine/store_timestamps_command.h b/chrome/browser/sync/engine/store_timestamps_command.h index 7d0e47f..7d0e47f 100755..100644 --- a/chrome/browser/sync/engine/store_timestamps_command.h +++ b/chrome/browser/sync/engine/store_timestamps_command.h diff --git a/chrome/browser/sync/protocol/sync.proto b/chrome/browser/sync/protocol/sync.proto index 2ca8b4c..2ca8b4c 100755..100644 --- a/chrome/browser/sync/protocol/sync.proto +++ b/chrome/browser/sync/protocol/sync.proto diff --git a/chrome/browser/sync/resources/gaia_login.html b/chrome/browser/sync/resources/gaia_login.html index 1360cbc..1360cbc 100755..100644 --- a/chrome/browser/sync/resources/gaia_login.html +++ b/chrome/browser/sync/resources/gaia_login.html diff --git a/chrome/browser/tab_contents/web_drag_utils_win.cc b/chrome/browser/tab_contents/web_drag_utils_win.cc index cd2af68..cd2af68 100755..100644 --- a/chrome/browser/tab_contents/web_drag_utils_win.cc +++ b/chrome/browser/tab_contents/web_drag_utils_win.cc diff --git a/chrome/browser/tab_contents/web_drag_utils_win.h b/chrome/browser/tab_contents/web_drag_utils_win.h index 6561733..6561733 100755..100644 --- a/chrome/browser/tab_contents/web_drag_utils_win.h +++ b/chrome/browser/tab_contents/web_drag_utils_win.h diff --git a/chrome/browser/views/options/content_filter_page_view.cc b/chrome/browser/views/options/content_filter_page_view.cc index 0327206..0327206 100755..100644 --- a/chrome/browser/views/options/content_filter_page_view.cc +++ b/chrome/browser/views/options/content_filter_page_view.cc diff --git a/chrome/browser/views/options/content_filter_page_view.h b/chrome/browser/views/options/content_filter_page_view.h index eaf6e33..eaf6e33 100755..100644 --- a/chrome/browser/views/options/content_filter_page_view.h +++ b/chrome/browser/views/options/content_filter_page_view.h diff --git a/chrome/browser/views/options/customize_sync_window_view.cc b/chrome/browser/views/options/customize_sync_window_view.cc index a4e3b5c..a4e3b5c 100755..100644 --- a/chrome/browser/views/options/customize_sync_window_view.cc +++ b/chrome/browser/views/options/customize_sync_window_view.cc diff --git a/chrome/browser/views/options/customize_sync_window_view.h b/chrome/browser/views/options/customize_sync_window_view.h index 0179427..0179427 100755..100644 --- a/chrome/browser/views/options/customize_sync_window_view.h +++ b/chrome/browser/views/options/customize_sync_window_view.h diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index cf6f8bf..cf6f8bf 100755..100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json index 5db6983..5db6983 100755..100644 --- a/chrome/common/extensions/api/extension_api.json +++ b/chrome/common/extensions/api/extension_api.json diff --git a/chrome/common/extensions/docs/css/ApiRefStyles.css b/chrome/common/extensions/docs/css/ApiRefStyles.css index b3b86f3..b3b86f3 100755..100644 --- a/chrome/common/extensions/docs/css/ApiRefStyles.css +++ b/chrome/common/extensions/docs/css/ApiRefStyles.css diff --git a/chrome/common/extensions/docs/examples/api/browserAction/make_page_red/manifest.json b/chrome/common/extensions/docs/examples/api/browserAction/make_page_red/manifest.json index 6bb35c6..6bb35c6 100755..100644 --- a/chrome/common/extensions/docs/examples/api/browserAction/make_page_red/manifest.json +++ b/chrome/common/extensions/docs/examples/api/browserAction/make_page_red/manifest.json diff --git a/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/manifest.json b/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/manifest.json index ea83de7..ea83de7 100755..100644 --- a/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/manifest.json +++ b/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/manifest.json diff --git a/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/manifest.json b/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/manifest.json index 83e9052..83e9052 100755..100644 --- a/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/manifest.json +++ b/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/manifest.json diff --git a/chrome/common/extensions/docs/examples/api/history/showHistory/manifest.json b/chrome/common/extensions/docs/examples/api/history/showHistory/manifest.json index 2b271df..2b271df 100755..100644 --- a/chrome/common/extensions/docs/examples/api/history/showHistory/manifest.json +++ b/chrome/common/extensions/docs/examples/api/history/showHistory/manifest.json diff --git a/chrome/common/extensions/docs/examples/api/tabs/screenshot/manifest.json b/chrome/common/extensions/docs/examples/api/tabs/screenshot/manifest.json index 37fdbf0..37fdbf0 100755..100644 --- a/chrome/common/extensions/docs/examples/api/tabs/screenshot/manifest.json +++ b/chrome/common/extensions/docs/examples/api/tabs/screenshot/manifest.json diff --git a/chrome/common/extensions/docs/examples/api/tabs/screenshot/screenshot.js b/chrome/common/extensions/docs/examples/api/tabs/screenshot/screenshot.js index a003719..a003719 100755..100644 --- a/chrome/common/extensions/docs/examples/api/tabs/screenshot/screenshot.js +++ b/chrome/common/extensions/docs/examples/api/tabs/screenshot/screenshot.js diff --git a/chrome/common/extensions/docs/examples/extensions/fx/bg.html b/chrome/common/extensions/docs/examples/extensions/fx/bg.html index 0753d5e..0753d5e 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/fx/bg.html +++ b/chrome/common/extensions/docs/examples/extensions/fx/bg.html diff --git a/chrome/common/extensions/docs/examples/extensions/fx/bg.js b/chrome/common/extensions/docs/examples/extensions/fx/bg.js index eab6a34..32e627f 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/fx/bg.js +++ b/chrome/common/extensions/docs/examples/extensions/fx/bg.js @@ -1,427 +1,427 @@ -/*
- * Background page for Chrome Sounds extension.
- * This tracks various events from Chrome and plays sounds.
- */
-
-// Map of hostname suffixes or URLs without query params to sounds.
-// Yeah OK, some of these are a little cliche...
-var urlSounds = {
- "http://www.google.ca/": "canadian-hello.mp3",
- "about:histograms": "time-passing.mp3",
- "about:memory": "transform!.mp3",
- "about:crash": "sadtrombone.mp3",
- "chrome://extensions/": "beepboop.mp3",
- "http://www.google.com.au/": "didgeridoo.mp3",
- "http://www.google.com.my/": "my_subway.mp3",
- "http://www.google.com/appserve/fiberrfi/": "dialup.mp3",
- "lively.com": "cricket.mp3",
- "http://www.google.co.uk/": "mind_the_gap.mp3",
- "http://news.google.com/": "news.mp3",
- "http://www.bing.com/": "sonar.mp3",
-};
-
-// Map of query parameter words to sounds.
-// More easy cliches...
-var searchSounds = {
- "scotland": "bagpipe.mp3",
- "seattle": "rain.mp3",
-};
-
-// Map of tab numbers to notes on a scale.
-var tabNoteSounds = {
- "tab0": "mando-1.mp3",
- "tab1": "mando-2.mp3",
- "tab2": "mando-3.mp3",
- "tab3": "mando-4.mp3",
- "tab4": "mando-5.mp3",
- "tab5": "mando-6.mp3",
- "tab6": "mando-7.mp3",
-};
-
-// Map of sounds that play in a continuous loop while an event is happening
-// in the content area (e.g. "keypress" while start and keep looping while
-// the user keeps typing).
-var contentSounds = {
- "keypress": "typewriter-1.mp3",
- "resize": "harp-transition-2.mp3",
- "scroll": "shepard.mp3"
-};
-
-// Map of events to their default sounds
-var eventSounds = {
- "tabCreated": "conga1.mp3",
- "tabMoved": "bell-transition.mp3",
- "tabRemoved": "smash-glass-1.mp3",
- "tabSelectionChanged": "click.mp3",
- "tabAttached": "whoosh-15.mp3",
- "tabDetached": "sword-shrill.mp3",
- "tabNavigated": "click.mp3",
- "windowCreated": "bell-small.mp3",
- "windowFocusChanged": "click.mp3",
- "bookmarkCreated": "bubble-drop.mp3",
- "bookmarkMoved": "thud.mp3",
- "bookmarkRemoved": "explosion-6.mp3",
- "windowCreatedIncognito": "weird-wind1.mp3",
- "startup": "whoosh-19.mp3"
-};
-
-var soundLists = [urlSounds, searchSounds, eventSounds, tabNoteSounds,
- contentSounds];
-
-var sounds = {};
-
-// Map of event names to extension events.
-// Events intentionally skipped:
-// chrome.windows.onRemoved - can't suppress the tab removed that comes first
-var events = {
- "tabCreated": chrome.tabs.onCreated,
- "tabMoved": chrome.tabs.onMoved,
- "tabRemoved": chrome.tabs.onRemoved,
- "tabSelectionChanged": chrome.tabs.onSelectionChanged,
- "tabAttached": chrome.tabs.onAttached,
- "tabDetached": chrome.tabs.onDetached,
- "tabNavigated": chrome.tabs.onUpdated,
- "windowCreated": chrome.windows.onCreated,
- "windowFocusChanged": chrome.windows.onFocusChanged,
- "bookmarkCreated": chrome.bookmarks.onCreated,
- "bookmarkMoved": chrome.bookmarks.onMoved,
- "bookmarkRemoved": chrome.bookmarks.onRemoved
-};
-
-// Map of event name to a validation function that is should return true if
-// the default sound should be played for this event.
-var eventValidator = {
- "tabCreated": tabCreated,
- "tabNavigated": tabNavigated,
- "tabRemoved": tabRemoved,
- "tabSelectionChanged": tabSelectionChanged,
- "windowCreated": windowCreated,
- "windowFocusChanged": windowFocusChanged,
-};
-
-var started = false;
-
-function shouldPlay(id) {
- // Ignore all events until the startup sound has finished.
- if (id != "startup" && !started)
- return false;
- var val = localStorage.getItem(id);
- if (val && val != "enabled") {
- console.log(id + " disabled");
- return false;
- }
- return true;
-}
-
-function didPlay(id) {
- if (!localStorage.getItem(id))
- localStorage.setItem(id, "enabled");
-}
-
-function playSound(id, loop) {
- if (!shouldPlay(id))
- return;
-
- var sound = sounds[id];
- console.log("playsound: " + id);
- if (sound && sound.src) {
- if (!sound.paused) {
- if (sound.currentTime < 0.2) {
- console.log("ignoring fast replay: " + id + "/" + sound.currentTime);
- return;
- }
- sound.pause();
- sound.currentTime = 0;
- }
- if (loop)
- sound.loop = loop;
-
- // Sometimes, when playing multiple times, readyState is HAVE_METADATA.
- if (sound.readyState == 0) { // HAVE_NOTHING
- console.log("bad ready state: " + sound.readyState);
- } else if (sound.error) {
- console.log("media error: " + sound.error);
- } else {
- didPlay(id);
- sound.play();
- }
- } else {
- console.log("bad playSound: " + id);
- }
-}
-
-function stopSound(id) {
- console.log("stopSound: " + id);
- var sound = sounds[id];
- if (sound && sound.src && !sound.paused) {
- sound.pause();
- sound.currentTime = 0;
- }
-}
-
-var base_url = "http://dl.google.com/dl/chrome/extensions/audio/";
-
-function soundLoadError(audio, id) {
- console.log("failed to load sound: " + id + "-" + audio.src);
- audio.src = "";
- if (id == "startup")
- started = true;
-}
-
-function soundLoaded(audio, id) {
- console.log("loaded sound: " + id);
- sounds[id] = audio;
- if (id == "startup")
- playSound(id);
-}
-
-// Hack to keep a reference to the objects while we're waiting for them to load.
-var notYetLoaded = {};
-
-function loadSound(file, id) {
- if (!file.length) {
- console.log("no sound for " + id);
- return;
- }
- var audio = new Audio();
- audio.id = id;
- audio.onerror = function() { soundLoadError(audio, id); };
- audio.addEventListener("canplaythrough",
- function() { soundLoaded(audio, id); }, false);
- if (id == "startup") {
- audio.addEventListener("ended", function() { started = true; });
- }
- audio.src = base_url + file;
- audio.load();
- notYetLoaded[id] = audio;
-}
-
-// Remember the last event so that we can avoid multiple events firing
-// unnecessarily (e.g. selection changed due to close).
-var eventsToEat = 0;
-
-function eatEvent(name) {
- if (eventsToEat > 0) {
- console.log("ate event: " + name);
- eventsToEat--;
- return true;
- }
- return false;
-}
-
-function soundEvent(event, name) {
- if (event) {
- var validator = eventValidator[name];
- if (validator) {
- event.addListener(function() {
- console.log("handling custom event: " + name);
-
- // Check this first since the validator may bump the count for future
- // events.
- var canPlay = (eventsToEat == 0);
- if (validator.apply(this, arguments)) {
- if (!canPlay) {
- console.log("ate event: " + name);
- eventsToEat--;
- return;
- }
- playSound(name);
- }
- });
- } else {
- event.addListener(function() {
- console.log("handling event: " + name);
- if (eatEvent(name)) {
- return;
- }
- playSound(name);
- });
- }
- } else {
- console.log("no event for " + name);
- }
-}
-
-var navSound;
-
-function stopNavSound() {
- if (navSound) {
- stopSound(navSound);
- navSound = null;
- }
-}
-
-function playNavSound(id) {
- stopNavSound();
- navSound = id;
- playSound(id);
-}
-
-function tabNavigated(tabId, changeInfo, tab) {
- // Quick fix to catch the case where the content script doesn't have a chance
- // to stop itself.
- stopSound("keypress");
-
- //console.log(JSON.stringify(changeInfo) + JSON.stringify(tab));
- if (changeInfo.status != "complete") {
- return false;
- }
- if (eatEvent("tabNavigated")) {
- return false;
- }
-
- console.log(JSON.stringify(tab));
-
- if (navSound)
- stopSound(navSound);
-
- var re = /https?:\/\/([^\/:]*)[^\?]*\??(.*)/i;
- match = re.exec(tab.url);
- if (match) {
- if (match.length == 3) {
- var query = match[2];
- var parts = query.split("&");
- for (var i in parts) {
- if (parts[i].indexOf("q=") == 0) {
- var q = decodeURIComponent(parts[i].substring(2));
- q = q.replace("+", " ");
- console.log("query == " + q);
- var words = q.split(" ");
- for (j in words) {
- if (searchSounds[words[j]]) {
- console.log("searchSound: " + words[j]);
- playNavSound(words[j]);
- return false;
- }
- }
- break;
- }
- }
- }
- if (match.length >= 2) {
- var hostname = match[1];
- if (hostname) {
- var parts = hostname.split(".");
- if (parts.length > 1) {
- var tld2 = parts.slice(-2).join(".");
- var tld3 = parts.slice(-3).join(".");
- var sound = urlSounds[tld2];
- if (sound) {
- playNavSound(tld2);
- return false;
- }
- sound = urlSounds[tld3];
- if (sound) {
- playNavSound(tld3);
- return false;
- }
- }
- }
- }
- }
-
- // Now try a direct URL match (without query string).
- var url = tab.url;
- var query = url.indexOf("?");
- if (query > 0) {
- url = tab.url.substring(0, query);
- }
- console.log(tab.url);
- var sound = urlSounds[url];
- if (sound) {
- playNavSound(url);
- return false;
- }
-
- return true;
-}
-
-var selectedTabId = -1;
-
-function tabSelectionChanged(tabId) {
- selectedTabId = tabId;
- if (eatEvent("tabSelectionChanged"))
- return false;
-
- var count = 7;
- chrome.tabs.get(tabId, function(tab) {
- var index = tab.index % count;
- playSound("tab" + index);
- });
- return false;
-}
-
-function tabCreated(tab) {
- if (eatEvent("tabCreated")) {
- return false;
- }
- eventsToEat++; // tabNavigated or tabSelectionChanged
- // TODO - unfortunately, we can't detect whether this tab will get focus, so
- // we can't decide whether or not to eat a second event.
- return true;
-}
-
-function tabRemoved(tabId) {
- if (eatEvent("tabRemoved")) {
- return false;
- }
- if (tabId == selectedTabId) {
- eventsToEat++; // tabSelectionChanged
- stopNavSound();
- }
- return true;
-}
-
-function windowCreated(window) {
- if (eatEvent("windowCreated")) {
- return false;
- }
- eventsToEat += 3; // tabNavigated, tabSelectionChanged, windowFocusChanged
- if (window.incognito) {
- playSound("windowCreatedIncognito");
- return false;
- }
- return true;
-}
-
-var selectedWindowId = -1;
-
-function windowFocusChanged(windowId) {
- if (windowId == selectedWindowId) {
- return false;
- }
- selectedWindowId = windowId;
- if (eatEvent("windowFocusChanged")) {
- return false;
- }
- return true;
-}
-
-function contentScriptHandler(request) {
- if (contentSounds[request.eventName]) {
- if (request.eventValue == "started") {
- playSound(request.eventName, true);
- } else if (request.eventValue == "stopped") {
- stopSound(request.eventName);
- } else {
- playSound(request.eventName);
- }
- }
- console.log("got message: " + JSON.stringify(request));
-}
-
-
-//////////////////////////////////////////////////////
-
-// Listen for messages from content scripts.
-chrome.extension.onRequest.addListener(contentScriptHandler);
-
-// Load the sounds and register event listeners.
-for (var list in soundLists) {
- for (var id in soundLists[list]) {
- loadSound(soundLists[list][id], id);
- }
-}
-for (var name in events) {
- soundEvent(events[name], name);
-}
+/* + * Background page for Chrome Sounds extension. + * This tracks various events from Chrome and plays sounds. + */ + +// Map of hostname suffixes or URLs without query params to sounds. +// Yeah OK, some of these are a little cliche... +var urlSounds = { + "http://www.google.ca/": "canadian-hello.mp3", + "about:histograms": "time-passing.mp3", + "about:memory": "transform!.mp3", + "about:crash": "sadtrombone.mp3", + "chrome://extensions/": "beepboop.mp3", + "http://www.google.com.au/": "didgeridoo.mp3", + "http://www.google.com.my/": "my_subway.mp3", + "http://www.google.com/appserve/fiberrfi/": "dialup.mp3", + "lively.com": "cricket.mp3", + "http://www.google.co.uk/": "mind_the_gap.mp3", + "http://news.google.com/": "news.mp3", + "http://www.bing.com/": "sonar.mp3", +}; + +// Map of query parameter words to sounds. +// More easy cliches... +var searchSounds = { + "scotland": "bagpipe.mp3", + "seattle": "rain.mp3", +}; + +// Map of tab numbers to notes on a scale. +var tabNoteSounds = { + "tab0": "mando-1.mp3", + "tab1": "mando-2.mp3", + "tab2": "mando-3.mp3", + "tab3": "mando-4.mp3", + "tab4": "mando-5.mp3", + "tab5": "mando-6.mp3", + "tab6": "mando-7.mp3", +}; + +// Map of sounds that play in a continuous loop while an event is happening +// in the content area (e.g. "keypress" while start and keep looping while +// the user keeps typing). +var contentSounds = { + "keypress": "typewriter-1.mp3", + "resize": "harp-transition-2.mp3", + "scroll": "shepard.mp3" +}; + +// Map of events to their default sounds +var eventSounds = { + "tabCreated": "conga1.mp3", + "tabMoved": "bell-transition.mp3", + "tabRemoved": "smash-glass-1.mp3", + "tabSelectionChanged": "click.mp3", + "tabAttached": "whoosh-15.mp3", + "tabDetached": "sword-shrill.mp3", + "tabNavigated": "click.mp3", + "windowCreated": "bell-small.mp3", + "windowFocusChanged": "click.mp3", + "bookmarkCreated": "bubble-drop.mp3", + "bookmarkMoved": "thud.mp3", + "bookmarkRemoved": "explosion-6.mp3", + "windowCreatedIncognito": "weird-wind1.mp3", + "startup": "whoosh-19.mp3" +}; + +var soundLists = [urlSounds, searchSounds, eventSounds, tabNoteSounds, + contentSounds]; + +var sounds = {}; + +// Map of event names to extension events. +// Events intentionally skipped: +// chrome.windows.onRemoved - can't suppress the tab removed that comes first +var events = { + "tabCreated": chrome.tabs.onCreated, + "tabMoved": chrome.tabs.onMoved, + "tabRemoved": chrome.tabs.onRemoved, + "tabSelectionChanged": chrome.tabs.onSelectionChanged, + "tabAttached": chrome.tabs.onAttached, + "tabDetached": chrome.tabs.onDetached, + "tabNavigated": chrome.tabs.onUpdated, + "windowCreated": chrome.windows.onCreated, + "windowFocusChanged": chrome.windows.onFocusChanged, + "bookmarkCreated": chrome.bookmarks.onCreated, + "bookmarkMoved": chrome.bookmarks.onMoved, + "bookmarkRemoved": chrome.bookmarks.onRemoved +}; + +// Map of event name to a validation function that is should return true if +// the default sound should be played for this event. +var eventValidator = { + "tabCreated": tabCreated, + "tabNavigated": tabNavigated, + "tabRemoved": tabRemoved, + "tabSelectionChanged": tabSelectionChanged, + "windowCreated": windowCreated, + "windowFocusChanged": windowFocusChanged, +}; + +var started = false; + +function shouldPlay(id) { + // Ignore all events until the startup sound has finished. + if (id != "startup" && !started) + return false; + var val = localStorage.getItem(id); + if (val && val != "enabled") { + console.log(id + " disabled"); + return false; + } + return true; +} + +function didPlay(id) { + if (!localStorage.getItem(id)) + localStorage.setItem(id, "enabled"); +} + +function playSound(id, loop) { + if (!shouldPlay(id)) + return; + + var sound = sounds[id]; + console.log("playsound: " + id); + if (sound && sound.src) { + if (!sound.paused) { + if (sound.currentTime < 0.2) { + console.log("ignoring fast replay: " + id + "/" + sound.currentTime); + return; + } + sound.pause(); + sound.currentTime = 0; + } + if (loop) + sound.loop = loop; + + // Sometimes, when playing multiple times, readyState is HAVE_METADATA. + if (sound.readyState == 0) { // HAVE_NOTHING + console.log("bad ready state: " + sound.readyState); + } else if (sound.error) { + console.log("media error: " + sound.error); + } else { + didPlay(id); + sound.play(); + } + } else { + console.log("bad playSound: " + id); + } +} + +function stopSound(id) { + console.log("stopSound: " + id); + var sound = sounds[id]; + if (sound && sound.src && !sound.paused) { + sound.pause(); + sound.currentTime = 0; + } +} + +var base_url = "http://dl.google.com/dl/chrome/extensions/audio/"; + +function soundLoadError(audio, id) { + console.log("failed to load sound: " + id + "-" + audio.src); + audio.src = ""; + if (id == "startup") + started = true; +} + +function soundLoaded(audio, id) { + console.log("loaded sound: " + id); + sounds[id] = audio; + if (id == "startup") + playSound(id); +} + +// Hack to keep a reference to the objects while we're waiting for them to load. +var notYetLoaded = {}; + +function loadSound(file, id) { + if (!file.length) { + console.log("no sound for " + id); + return; + } + var audio = new Audio(); + audio.id = id; + audio.onerror = function() { soundLoadError(audio, id); }; + audio.addEventListener("canplaythrough", + function() { soundLoaded(audio, id); }, false); + if (id == "startup") { + audio.addEventListener("ended", function() { started = true; }); + } + audio.src = base_url + file; + audio.load(); + notYetLoaded[id] = audio; +} + +// Remember the last event so that we can avoid multiple events firing +// unnecessarily (e.g. selection changed due to close). +var eventsToEat = 0; + +function eatEvent(name) { + if (eventsToEat > 0) { + console.log("ate event: " + name); + eventsToEat--; + return true; + } + return false; +} + +function soundEvent(event, name) { + if (event) { + var validator = eventValidator[name]; + if (validator) { + event.addListener(function() { + console.log("handling custom event: " + name); + + // Check this first since the validator may bump the count for future + // events. + var canPlay = (eventsToEat == 0); + if (validator.apply(this, arguments)) { + if (!canPlay) { + console.log("ate event: " + name); + eventsToEat--; + return; + } + playSound(name); + } + }); + } else { + event.addListener(function() { + console.log("handling event: " + name); + if (eatEvent(name)) { + return; + } + playSound(name); + }); + } + } else { + console.log("no event for " + name); + } +} + +var navSound; + +function stopNavSound() { + if (navSound) { + stopSound(navSound); + navSound = null; + } +} + +function playNavSound(id) { + stopNavSound(); + navSound = id; + playSound(id); +} + +function tabNavigated(tabId, changeInfo, tab) { + // Quick fix to catch the case where the content script doesn't have a chance + // to stop itself. + stopSound("keypress"); + + //console.log(JSON.stringify(changeInfo) + JSON.stringify(tab)); + if (changeInfo.status != "complete") { + return false; + } + if (eatEvent("tabNavigated")) { + return false; + } + + console.log(JSON.stringify(tab)); + + if (navSound) + stopSound(navSound); + + var re = /https?:\/\/([^\/:]*)[^\?]*\??(.*)/i; + match = re.exec(tab.url); + if (match) { + if (match.length == 3) { + var query = match[2]; + var parts = query.split("&"); + for (var i in parts) { + if (parts[i].indexOf("q=") == 0) { + var q = decodeURIComponent(parts[i].substring(2)); + q = q.replace("+", " "); + console.log("query == " + q); + var words = q.split(" "); + for (j in words) { + if (searchSounds[words[j]]) { + console.log("searchSound: " + words[j]); + playNavSound(words[j]); + return false; + } + } + break; + } + } + } + if (match.length >= 2) { + var hostname = match[1]; + if (hostname) { + var parts = hostname.split("."); + if (parts.length > 1) { + var tld2 = parts.slice(-2).join("."); + var tld3 = parts.slice(-3).join("."); + var sound = urlSounds[tld2]; + if (sound) { + playNavSound(tld2); + return false; + } + sound = urlSounds[tld3]; + if (sound) { + playNavSound(tld3); + return false; + } + } + } + } + } + + // Now try a direct URL match (without query string). + var url = tab.url; + var query = url.indexOf("?"); + if (query > 0) { + url = tab.url.substring(0, query); + } + console.log(tab.url); + var sound = urlSounds[url]; + if (sound) { + playNavSound(url); + return false; + } + + return true; +} + +var selectedTabId = -1; + +function tabSelectionChanged(tabId) { + selectedTabId = tabId; + if (eatEvent("tabSelectionChanged")) + return false; + + var count = 7; + chrome.tabs.get(tabId, function(tab) { + var index = tab.index % count; + playSound("tab" + index); + }); + return false; +} + +function tabCreated(tab) { + if (eatEvent("tabCreated")) { + return false; + } + eventsToEat++; // tabNavigated or tabSelectionChanged + // TODO - unfortunately, we can't detect whether this tab will get focus, so + // we can't decide whether or not to eat a second event. + return true; +} + +function tabRemoved(tabId) { + if (eatEvent("tabRemoved")) { + return false; + } + if (tabId == selectedTabId) { + eventsToEat++; // tabSelectionChanged + stopNavSound(); + } + return true; +} + +function windowCreated(window) { + if (eatEvent("windowCreated")) { + return false; + } + eventsToEat += 3; // tabNavigated, tabSelectionChanged, windowFocusChanged + if (window.incognito) { + playSound("windowCreatedIncognito"); + return false; + } + return true; +} + +var selectedWindowId = -1; + +function windowFocusChanged(windowId) { + if (windowId == selectedWindowId) { + return false; + } + selectedWindowId = windowId; + if (eatEvent("windowFocusChanged")) { + return false; + } + return true; +} + +function contentScriptHandler(request) { + if (contentSounds[request.eventName]) { + if (request.eventValue == "started") { + playSound(request.eventName, true); + } else if (request.eventValue == "stopped") { + stopSound(request.eventName); + } else { + playSound(request.eventName); + } + } + console.log("got message: " + JSON.stringify(request)); +} + + +////////////////////////////////////////////////////// + +// Listen for messages from content scripts. +chrome.extension.onRequest.addListener(contentScriptHandler); + +// Load the sounds and register event listeners. +for (var list in soundLists) { + for (var id in soundLists[list]) { + loadSound(soundLists[list][id], id); + } +} +for (var name in events) { + soundEvent(events[name], name); +} diff --git a/chrome/common/extensions/docs/examples/extensions/fx/content.js b/chrome/common/extensions/docs/examples/extensions/fx/content.js index 9c1e7de..b79095c 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/fx/content.js +++ b/chrome/common/extensions/docs/examples/extensions/fx/content.js @@ -1,62 +1,62 @@ -/*
- * Content script for Chrome Sounds.
- * Tracks in-page events and notifies the background page.
- */
-
-function sendEvent(event, value) {
- console.log("sendEvent: " + event + "," + value);
- chrome.extension.sendRequest({eventName: event, eventValue: value});
-}
-
-// Timers to trigger "stopEvent" for coalescing events.
-var timers = {};
-
-function stopEvent(type) {
- timers[type] = 0;
- sendEvent(type, "stopped");
-}
-
-// Automatically coalesces repeating events into a start and a stop event.
-// |validator| is a function which should return true if the event is
-// considered to be a valid event of this type.
-function handleEvent(event, type, validator) {
- if (validator) {
- if (!validator(event)) {
- return;
- }
- }
- var timerId = timers[type];
- var eventInProgress = (timerId > 0);
- if (eventInProgress) {
- clearTimeout(timerId);
- timers[type] = 0;
- } else {
- sendEvent(type, "started");
- }
- timers[type] = setTimeout(stopEvent, 300, type);
-}
-
-function listenAndCoalesce(target, type, validator) {
- target.addEventListener(type, function(event) {
- handleEvent(event, type, validator);
- }, true);
-}
-
-listenAndCoalesce(document, "scroll");
-
-// For some reason, "resize" doesn't seem to work with addEventListener.
-if ((window == window.top) && document.body && !document.body.onresize) {
- document.body.onresize = function(event) {
- sendEvent("resize", "");
- };
-}
-
-listenAndCoalesce(document, "keypress", function(event) {
- if (event.charCode == 13)
- return false;
-
- // TODO(erikkay) This doesn't work in gmail's rich text compose window.
- return event.target.tagName == "TEXTAREA" ||
- event.target.tagName == "INPUT" ||
- event.target.isContentEditable;
-});
+/* + * Content script for Chrome Sounds. + * Tracks in-page events and notifies the background page. + */ + +function sendEvent(event, value) { + console.log("sendEvent: " + event + "," + value); + chrome.extension.sendRequest({eventName: event, eventValue: value}); +} + +// Timers to trigger "stopEvent" for coalescing events. +var timers = {}; + +function stopEvent(type) { + timers[type] = 0; + sendEvent(type, "stopped"); +} + +// Automatically coalesces repeating events into a start and a stop event. +// |validator| is a function which should return true if the event is +// considered to be a valid event of this type. +function handleEvent(event, type, validator) { + if (validator) { + if (!validator(event)) { + return; + } + } + var timerId = timers[type]; + var eventInProgress = (timerId > 0); + if (eventInProgress) { + clearTimeout(timerId); + timers[type] = 0; + } else { + sendEvent(type, "started"); + } + timers[type] = setTimeout(stopEvent, 300, type); +} + +function listenAndCoalesce(target, type, validator) { + target.addEventListener(type, function(event) { + handleEvent(event, type, validator); + }, true); +} + +listenAndCoalesce(document, "scroll"); + +// For some reason, "resize" doesn't seem to work with addEventListener. +if ((window == window.top) && document.body && !document.body.onresize) { + document.body.onresize = function(event) { + sendEvent("resize", ""); + }; +} + +listenAndCoalesce(document, "keypress", function(event) { + if (event.charCode == 13) + return false; + + // TODO(erikkay) This doesn't work in gmail's rich text compose window. + return event.target.tagName == "TEXTAREA" || + event.target.tagName == "INPUT" || + event.target.isContentEditable; +}); diff --git a/chrome/common/extensions/docs/examples/extensions/fx/icon.png b/chrome/common/extensions/docs/examples/extensions/fx/icon.png Binary files differindex c8322c3..c8322c3 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/fx/icon.png +++ b/chrome/common/extensions/docs/examples/extensions/fx/icon.png diff --git a/chrome/common/extensions/docs/examples/extensions/fx/manifest.json b/chrome/common/extensions/docs/examples/extensions/fx/manifest.json index 0fa4af9..b3c8ada 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/fx/manifest.json +++ b/chrome/common/extensions/docs/examples/extensions/fx/manifest.json @@ -1,19 +1,19 @@ -{
- "name": "Chrome Sounds",
- "version": "1.1",
- "description": "Enjoy a more magical and immersive experience when browsing the web using the power of sound.",
- "background_page": "bg.html",
- "options_page": "options.html",
- "icons": { "128": "icon.png" },
- "permissions": [
- "tabs",
- "bookmarks",
- "http://*/*",
- "https://*/*"
- ],
- "content_scripts": [ {
- "matches": ["http://*/*", "https://*/*"],
- "js": ["content.js"],
- "all_frames": true
- }]
-}
+{ + "name": "Chrome Sounds", + "version": "1.1", + "description": "Enjoy a more magical and immersive experience when browsing the web using the power of sound.", + "background_page": "bg.html", + "options_page": "options.html", + "icons": { "128": "icon.png" }, + "permissions": [ + "tabs", + "bookmarks", + "http://*/*", + "https://*/*" + ], + "content_scripts": [ { + "matches": ["http://*/*", "https://*/*"], + "js": ["content.js"], + "all_frames": true + }] +} diff --git a/chrome/common/extensions/docs/examples/extensions/fx/options.html b/chrome/common/extensions/docs/examples/extensions/fx/options.html index 8f5171c..8f5171c 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/fx/options.html +++ b/chrome/common/extensions/docs/examples/extensions/fx/options.html diff --git a/chrome/common/extensions/docs/examples/extensions/gdocs/README b/chrome/common/extensions/docs/examples/extensions/gdocs/README index 9c0393b..9c0393b 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gdocs/README +++ b/chrome/common/extensions/docs/examples/extensions/gdocs/README diff --git a/chrome/common/extensions/docs/examples/extensions/gdocs/background.html b/chrome/common/extensions/docs/examples/extensions/gdocs/background.html index 34478f5..34478f5 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gdocs/background.html +++ b/chrome/common/extensions/docs/examples/extensions/gdocs/background.html diff --git a/chrome/common/extensions/docs/examples/extensions/gdocs/chrome_ex_oauth.html b/chrome/common/extensions/docs/examples/extensions/gdocs/chrome_ex_oauth.html index 61d0ac2..61d0ac2 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gdocs/chrome_ex_oauth.html +++ b/chrome/common/extensions/docs/examples/extensions/gdocs/chrome_ex_oauth.html diff --git a/chrome/common/extensions/docs/examples/extensions/gdocs/chrome_ex_oauth.js b/chrome/common/extensions/docs/examples/extensions/gdocs/chrome_ex_oauth.js index 384616c..384616c 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gdocs/chrome_ex_oauth.js +++ b/chrome/common/extensions/docs/examples/extensions/gdocs/chrome_ex_oauth.js diff --git a/chrome/common/extensions/docs/examples/extensions/gdocs/chrome_ex_oauthsimple.js b/chrome/common/extensions/docs/examples/extensions/gdocs/chrome_ex_oauthsimple.js index af0fe8a..af0fe8a 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gdocs/chrome_ex_oauthsimple.js +++ b/chrome/common/extensions/docs/examples/extensions/gdocs/chrome_ex_oauthsimple.js diff --git a/chrome/common/extensions/docs/examples/extensions/gdocs/manifest.json b/chrome/common/extensions/docs/examples/extensions/gdocs/manifest.json index 5e715f6..5e715f6 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gdocs/manifest.json +++ b/chrome/common/extensions/docs/examples/extensions/gdocs/manifest.json diff --git a/chrome/common/extensions/docs/examples/extensions/gdocs/options.html b/chrome/common/extensions/docs/examples/extensions/gdocs/options.html index fc5ab5b..fc5ab5b 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gdocs/options.html +++ b/chrome/common/extensions/docs/examples/extensions/gdocs/options.html diff --git a/chrome/common/extensions/docs/examples/extensions/gdocs/popup.html b/chrome/common/extensions/docs/examples/extensions/gdocs/popup.html index f2d9933..f2d9933 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gdocs/popup.html +++ b/chrome/common/extensions/docs/examples/extensions/gdocs/popup.html diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ar/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ar/messages.json index 87faf64..87faf64 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ar/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ar/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/bg/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/bg/messages.json index 0903503..0903503 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/bg/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/bg/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ca/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ca/messages.json index 6c2b1b2..6c2b1b2 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ca/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ca/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/cs/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/cs/messages.json index 394e6add..394e6add 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/cs/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/cs/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/da/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/da/messages.json index e1c2f82..e1c2f82 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/da/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/da/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/de/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/de/messages.json index 6c21886..6c21886 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/de/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/de/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/el/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/el/messages.json index 7db2714..7db2714 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/el/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/el/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/en_GB/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/en_GB/messages.json index d3fa3a3..d3fa3a3 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/en_GB/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/en_GB/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/es_419/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/es_419/messages.json index 54bf2703..54bf2703 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/es_419/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/es_419/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/et/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/et/messages.json index 20b1e84..20b1e84 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/et/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/et/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/fi/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/fi/messages.json index f9da2c1..f9da2c1 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/fi/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/fi/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/fil/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/fil/messages.json index 1a019a6..1a019a6 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/fil/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/fil/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/fr/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/fr/messages.json index 2900819..2900819 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/fr/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/fr/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/he/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/he/messages.json index c32e982..c32e982 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/he/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/he/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/hi/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/hi/messages.json index 0056c56..0056c56 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/hi/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/hi/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/hr/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/hr/messages.json index 94dce1c..94dce1c 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/hr/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/hr/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/hu/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/hu/messages.json index 8b3e6c9..8b3e6c9 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/hu/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/hu/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/id/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/id/messages.json index 4a8d09c..4a8d09c 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/id/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/id/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/it/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/it/messages.json index 13b6e78..13b6e78 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/it/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/it/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ja/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ja/messages.json index 3ce2669..3ce2669 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ja/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ja/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ko/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ko/messages.json index 934e49e..934e49e 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ko/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ko/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/lt/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/lt/messages.json index 7da57e1..7da57e1 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/lt/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/lt/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/lv/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/lv/messages.json index 52f2ca3..52f2ca3 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/lv/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/lv/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/nb/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/nb/messages.json index ad8a09d..ad8a09d 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/nb/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/nb/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/nl/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/nl/messages.json index c40d81f..c40d81f 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/nl/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/nl/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/pl/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/pl/messages.json index d607a06..d607a06 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/pl/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/pl/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/pt_BR/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/pt_BR/messages.json index 1175d0c..1175d0c 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/pt_BR/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/pt_BR/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/pt_PT/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/pt_PT/messages.json index e6d8992..e6d8992 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/pt_PT/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/pt_PT/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ro/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ro/messages.json index d0d5838..d0d5838 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ro/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ro/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ru/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ru/messages.json index dedaef1..dedaef1 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ru/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/ru/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/sk/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/sk/messages.json index 13d902a..13d902a 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/sk/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/sk/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/sl/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/sl/messages.json index 962a8c6..962a8c6 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/sl/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/sl/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/sr/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/sr/messages.json index a2cfdb4..a2cfdb4 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/sr/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/sr/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/sv/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/sv/messages.json index b4359f35..b4359f35 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/sv/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/sv/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/th/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/th/messages.json index e5bef6c..e5bef6c 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/th/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/th/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/tr/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/tr/messages.json index 593057d..593057d 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/tr/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/tr/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/uk/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/uk/messages.json index 0d196cc..0d196cc 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/uk/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/uk/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/vi/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/vi/messages.json index d26050f..d26050f 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/vi/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/vi/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/zh_CN/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/zh_CN/messages.json index ae6227f..ae6227f 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/zh_CN/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/zh_CN/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/zh_TW/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/zh_TW/messages.json index 4c31793..4c31793 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/zh_TW/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/zh_TW/messages.json diff --git a/chrome/common/extensions/docs/examples/extensions/irc/README.txt b/chrome/common/extensions/docs/examples/extensions/irc/README.txt index 692beb9..692beb9 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/irc/README.txt +++ b/chrome/common/extensions/docs/examples/extensions/irc/README.txt diff --git a/chrome/common/extensions/docs/examples/extensions/irc/app/manifest.json b/chrome/common/extensions/docs/examples/extensions/irc/app/manifest.json index ec0d787..ec0d787 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/irc/app/manifest.json +++ b/chrome/common/extensions/docs/examples/extensions/irc/app/manifest.json diff --git a/chrome/common/extensions/docs/examples/extensions/irc/conf/irc.xml b/chrome/common/extensions/docs/examples/extensions/irc/conf/irc.xml index 13441c9..13441c9 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/irc/conf/irc.xml +++ b/chrome/common/extensions/docs/examples/extensions/irc/conf/irc.xml diff --git a/chrome/common/extensions/docs/examples/extensions/irc/conf/jetty.xml b/chrome/common/extensions/docs/examples/extensions/irc/conf/jetty.xml index 5883d61..5883d61 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/irc/conf/jetty.xml +++ b/chrome/common/extensions/docs/examples/extensions/irc/conf/jetty.xml diff --git a/chrome/common/extensions/docs/examples/extensions/irc/conf/webdefault.xml b/chrome/common/extensions/docs/examples/extensions/irc/conf/webdefault.xml index b52cadd..b52cadd 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/irc/conf/webdefault.xml +++ b/chrome/common/extensions/docs/examples/extensions/irc/conf/webdefault.xml diff --git a/chrome/common/extensions/docs/examples/extensions/irc/servlet/WEB-INF/web.xml b/chrome/common/extensions/docs/examples/extensions/irc/servlet/WEB-INF/web.xml index 151b76d..151b76d 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/irc/servlet/WEB-INF/web.xml +++ b/chrome/common/extensions/docs/examples/extensions/irc/servlet/WEB-INF/web.xml diff --git a/chrome/common/extensions/docs/examples/extensions/irc/servlet/addChannel.html b/chrome/common/extensions/docs/examples/extensions/irc/servlet/addChannel.html index 5007b09..5007b09 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/irc/servlet/addChannel.html +++ b/chrome/common/extensions/docs/examples/extensions/irc/servlet/addChannel.html diff --git a/chrome/common/extensions/docs/examples/extensions/irc/servlet/addServer.html b/chrome/common/extensions/docs/examples/extensions/irc/servlet/addServer.html index 1fa6b2d..1fa6b2d 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/irc/servlet/addServer.html +++ b/chrome/common/extensions/docs/examples/extensions/irc/servlet/addServer.html diff --git a/chrome/common/extensions/docs/examples/extensions/irc/servlet/index.html b/chrome/common/extensions/docs/examples/extensions/irc/servlet/index.html index f5fff2b..f5fff2b 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/irc/servlet/index.html +++ b/chrome/common/extensions/docs/examples/extensions/irc/servlet/index.html diff --git a/chrome/common/extensions/docs/examples/extensions/irc/servlet/irc.js b/chrome/common/extensions/docs/examples/extensions/irc/servlet/irc.js index b169952..b169952 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/irc/servlet/irc.js +++ b/chrome/common/extensions/docs/examples/extensions/irc/servlet/irc.js diff --git a/chrome/common/extensions/docs/examples/extensions/irc/servlet/jstemplate/jsevalcontext.js b/chrome/common/extensions/docs/examples/extensions/irc/servlet/jstemplate/jsevalcontext.js index 0fc00ff7..0fc00ff7 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/irc/servlet/jstemplate/jsevalcontext.js +++ b/chrome/common/extensions/docs/examples/extensions/irc/servlet/jstemplate/jsevalcontext.js diff --git a/chrome/common/extensions/docs/examples/extensions/irc/servlet/jstemplate/jstemplate.js b/chrome/common/extensions/docs/examples/extensions/irc/servlet/jstemplate/jstemplate.js index f5d9f77..f5d9f77 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/irc/servlet/jstemplate/jstemplate.js +++ b/chrome/common/extensions/docs/examples/extensions/irc/servlet/jstemplate/jstemplate.js diff --git a/chrome/common/extensions/docs/examples/extensions/irc/servlet/jstemplate/util.js b/chrome/common/extensions/docs/examples/extensions/irc/servlet/jstemplate/util.js index f6c1f46..f6c1f46 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/irc/servlet/jstemplate/util.js +++ b/chrome/common/extensions/docs/examples/extensions/irc/servlet/jstemplate/util.js diff --git a/chrome/common/extensions/docs/examples/extensions/irc/servlet/notification.html b/chrome/common/extensions/docs/examples/extensions/irc/servlet/notification.html index 89b37e03..89b37e03 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/irc/servlet/notification.html +++ b/chrome/common/extensions/docs/examples/extensions/irc/servlet/notification.html diff --git a/chrome/common/extensions/docs/examples/extensions/irc/servlet/src/org/chromium/IRCProxyWebSocket.java b/chrome/common/extensions/docs/examples/extensions/irc/servlet/src/org/chromium/IRCProxyWebSocket.java index d1de9e5..522d47a 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/irc/servlet/src/org/chromium/IRCProxyWebSocket.java +++ b/chrome/common/extensions/docs/examples/extensions/irc/servlet/src/org/chromium/IRCProxyWebSocket.java @@ -1,116 +1,116 @@ -package org.chromium;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-import javax.net.SocketFactory;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.eclipse.jetty.websocket.WebSocket;
-import org.eclipse.jetty.websocket.WebSocketServlet;
-
-public class IRCProxyWebSocket extends WebSocketServlet {
-
- private static final long serialVersionUID = 1L;
-
- private final Set<ChatWebSocket> members_ =
- new CopyOnWriteArraySet<ChatWebSocket>();
-
- protected void doGet(HttpServletRequest request, HttpServletResponse response)
- throws ServletException ,IOException {
- getServletContext().getNamedDispatcher("default").forward(request,response);
- }
-
- protected WebSocket doWebSocketConnect(HttpServletRequest request,
- String protocol) {
- return new ChatWebSocket();
- }
-
- class ChatWebSocket implements WebSocket, Runnable {
- Outbound outbound_;
- Socket socket_ = null;
- OutputStreamWriter out_;
- BufferedReader in_;
- Thread thread_;
- byte frame_ = 0;
-
- public void onConnect(Outbound outbound) {
- outbound_= outbound;
- }
-
- public void onMessage(byte frame, byte[] data,int offset, int length) {}
-
- public void onMessage(byte frame, String data) {
- try {
- if (socket_ == null) {
- try {
- // We assume the client is going to connect and initiate a
- // connection with the message "server:port".
- String tokens[] = data.split(":");
- socket_ = SocketFactory.getDefault().createSocket(tokens[0],
- Integer.parseInt(tokens[1]));
- out_ = new OutputStreamWriter(socket_.getOutputStream());
- InputStreamReader in = new InputStreamReader(
- socket_.getInputStream());
- in_ = new BufferedReader(in);
-
- members_.add(this);
- thread_ = new Thread(this);
- thread_.start();
-
- } catch (UnknownHostException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- } else {
- System.out.print(">> " + data);
- out_.write(data);
- out_.flush();
- }
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- public void onDisconnect() {
- try {
- socket_.close();
- thread_.stop();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- members_.remove(this);
- }
-
- @Override
- public void run() {
- while(true) {
- try {
- if (in_.ready()) {
- String line = in_.readLine();
- System.out.println("<< " + line);
- outbound_.sendMessage(frame_, line + "\r\n");
-
- } else {
- Thread.sleep(100);
- }
- } catch (IOException e) {
- } catch (InterruptedException e) {
- }
- }
- }
- }
-}
+package org.chromium; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.net.Socket; +import java.net.UnknownHostException; +import java.util.Set; +import java.util.concurrent.CopyOnWriteArraySet; + +import javax.net.SocketFactory; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.eclipse.jetty.websocket.WebSocket; +import org.eclipse.jetty.websocket.WebSocketServlet; + +public class IRCProxyWebSocket extends WebSocketServlet { + + private static final long serialVersionUID = 1L; + + private final Set<ChatWebSocket> members_ = + new CopyOnWriteArraySet<ChatWebSocket>(); + + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException ,IOException { + getServletContext().getNamedDispatcher("default").forward(request,response); + } + + protected WebSocket doWebSocketConnect(HttpServletRequest request, + String protocol) { + return new ChatWebSocket(); + } + + class ChatWebSocket implements WebSocket, Runnable { + Outbound outbound_; + Socket socket_ = null; + OutputStreamWriter out_; + BufferedReader in_; + Thread thread_; + byte frame_ = 0; + + public void onConnect(Outbound outbound) { + outbound_= outbound; + } + + public void onMessage(byte frame, byte[] data,int offset, int length) {} + + public void onMessage(byte frame, String data) { + try { + if (socket_ == null) { + try { + // We assume the client is going to connect and initiate a + // connection with the message "server:port". + String tokens[] = data.split(":"); + socket_ = SocketFactory.getDefault().createSocket(tokens[0], + Integer.parseInt(tokens[1])); + out_ = new OutputStreamWriter(socket_.getOutputStream()); + InputStreamReader in = new InputStreamReader( + socket_.getInputStream()); + in_ = new BufferedReader(in); + + members_.add(this); + thread_ = new Thread(this); + thread_.start(); + + } catch (UnknownHostException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } else { + System.out.print(">> " + data); + out_.write(data); + out_.flush(); + } + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + public void onDisconnect() { + try { + socket_.close(); + thread_.stop(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + members_.remove(this); + } + + @Override + public void run() { + while(true) { + try { + if (in_.ready()) { + String line = in_.readLine(); + System.out.println("<< " + line); + outbound_.sendMessage(frame_, line + "\r\n"); + + } else { + Thread.sleep(100); + } + } catch (IOException e) { + } catch (InterruptedException e) { + } + } + } + } +} diff --git a/chrome/common/extensions/docs/examples/extensions/irc/servlet/styles.css b/chrome/common/extensions/docs/examples/extensions/irc/servlet/styles.css index 2964acd..2964acd 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/irc/servlet/styles.css +++ b/chrome/common/extensions/docs/examples/extensions/irc/servlet/styles.css diff --git a/chrome/common/extensions/docs/examples/extensions/irc/servlet/util.js b/chrome/common/extensions/docs/examples/extensions/irc/servlet/util.js index ee1d332..ee1d332 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/irc/servlet/util.js +++ b/chrome/common/extensions/docs/examples/extensions/irc/servlet/util.js diff --git a/chrome/common/extensions/docs/examples/extensions/mappy/background.html b/chrome/common/extensions/docs/examples/extensions/mappy/background.html index ff6f7c9..ff6f7c9 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/mappy/background.html +++ b/chrome/common/extensions/docs/examples/extensions/mappy/background.html diff --git a/chrome/common/extensions/docs/examples/extensions/mappy/manifest.json b/chrome/common/extensions/docs/examples/extensions/mappy/manifest.json index 9c3858e..9c3858e 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/mappy/manifest.json +++ b/chrome/common/extensions/docs/examples/extensions/mappy/manifest.json diff --git a/chrome/common/extensions/docs/examples/extensions/mappy/mappy_content_script.js b/chrome/common/extensions/docs/examples/extensions/mappy/mappy_content_script.js index c4c5fba..c4c5fba 100755..100644 --- a/chrome/common/extensions/docs/examples/extensions/mappy/mappy_content_script.js +++ b/chrome/common/extensions/docs/examples/extensions/mappy/mappy_content_script.js diff --git a/chrome/common/extensions/docs/examples/tutorials/getstarted/manifest.json b/chrome/common/extensions/docs/examples/tutorials/getstarted/manifest.json index 8fe1793..8fe1793 100755..100644 --- a/chrome/common/extensions/docs/examples/tutorials/getstarted/manifest.json +++ b/chrome/common/extensions/docs/examples/tutorials/getstarted/manifest.json diff --git a/chrome/common/extensions/docs/images/code_labs_logo.gif b/chrome/common/extensions/docs/images/code_labs_logo.gif Binary files differindex b1c5f0d..b1c5f0d 100755..100644 --- a/chrome/common/extensions/docs/images/code_labs_logo.gif +++ b/chrome/common/extensions/docs/images/code_labs_logo.gif diff --git a/chrome/common/extensions/docs/images/hello-world-1.gif b/chrome/common/extensions/docs/images/hello-world-1.gif Binary files differindex 165ca36b..165ca36b 100755..100644 --- a/chrome/common/extensions/docs/images/hello-world-1.gif +++ b/chrome/common/extensions/docs/images/hello-world-1.gif diff --git a/chrome/common/extensions/docs/images/hello-world-2.gif b/chrome/common/extensions/docs/images/hello-world-2.gif Binary files differindex f6ee358..f6ee358 100755..100644 --- a/chrome/common/extensions/docs/images/hello-world-2.gif +++ b/chrome/common/extensions/docs/images/hello-world-2.gif diff --git a/chrome/common/extensions/docs/images/hw-1.gif b/chrome/common/extensions/docs/images/hw-1.gif Binary files differindex eebb691..eebb691 100755..100644 --- a/chrome/common/extensions/docs/images/hw-1.gif +++ b/chrome/common/extensions/docs/images/hw-1.gif diff --git a/chrome/common/extensions/docs/images/hw-2.gif b/chrome/common/extensions/docs/images/hw-2.gif Binary files differindex ec5eee2..ec5eee2 100755..100644 --- a/chrome/common/extensions/docs/images/hw-2.gif +++ b/chrome/common/extensions/docs/images/hw-2.gif diff --git a/chrome/common/extensions/docs/images/hw-3.gif b/chrome/common/extensions/docs/images/hw-3.gif Binary files differindex ddb1ec0..ddb1ec0 100755..100644 --- a/chrome/common/extensions/docs/images/hw-3.gif +++ b/chrome/common/extensions/docs/images/hw-3.gif diff --git a/chrome/common/extensions/docs/images/news.gif b/chrome/common/extensions/docs/images/news.gif Binary files differindex 55b2a63..55b2a63 100755..100644 --- a/chrome/common/extensions/docs/images/news.gif +++ b/chrome/common/extensions/docs/images/news.gif diff --git a/chrome/common/extensions/docs/images/package-success.gif b/chrome/common/extensions/docs/images/package-success.gif Binary files differindex 175a049..175a049 100755..100644 --- a/chrome/common/extensions/docs/images/package-success.gif +++ b/chrome/common/extensions/docs/images/package-success.gif diff --git a/chrome/common/extensions/docs/images/themes-1.gif b/chrome/common/extensions/docs/images/themes-1.gif Binary files differindex fb4bff8..fb4bff8 100755..100644 --- a/chrome/common/extensions/docs/images/themes-1.gif +++ b/chrome/common/extensions/docs/images/themes-1.gif diff --git a/chrome/common/extensions/docs/images/themes-2.gif b/chrome/common/extensions/docs/images/themes-2.gif Binary files differindex 17f35ae..17f35ae 100755..100644 --- a/chrome/common/extensions/docs/images/themes-2.gif +++ b/chrome/common/extensions/docs/images/themes-2.gif diff --git a/chrome/common/extensions/docs/images/themes-3.gif b/chrome/common/extensions/docs/images/themes-3.gif Binary files differindex ed55160..ed55160 100755..100644 --- a/chrome/common/extensions/docs/images/themes-3.gif +++ b/chrome/common/extensions/docs/images/themes-3.gif diff --git a/chrome/common/extensions/docs/images/toolsmenu.gif b/chrome/common/extensions/docs/images/toolsmenu.gif Binary files differindex d6afcab..d6afcab 100755..100644 --- a/chrome/common/extensions/docs/images/toolsmenu.gif +++ b/chrome/common/extensions/docs/images/toolsmenu.gif diff --git a/chrome/common/extensions/docs/images/update-success.gif b/chrome/common/extensions/docs/images/update-success.gif Binary files differindex 66e3e8b..66e3e8b 100755..100644 --- a/chrome/common/extensions/docs/images/update-success.gif +++ b/chrome/common/extensions/docs/images/update-success.gif diff --git a/chrome/common/extensions/docs/js/api_page_generator.js b/chrome/common/extensions/docs/js/api_page_generator.js index c1adb11..c1adb11 100755..100644 --- a/chrome/common/extensions/docs/js/api_page_generator.js +++ b/chrome/common/extensions/docs/js/api_page_generator.js diff --git a/chrome/common/extensions/docs/js/bootstrap.js b/chrome/common/extensions/docs/js/bootstrap.js index 738686e..738686e 100755..100644 --- a/chrome/common/extensions/docs/js/bootstrap.js +++ b/chrome/common/extensions/docs/js/bootstrap.js diff --git a/chrome/common/extensions/docs/static/experimental.processes.html b/chrome/common/extensions/docs/static/experimental.processes.html index e4e4183..e4e4183 100755..100644 --- a/chrome/common/extensions/docs/static/experimental.processes.html +++ b/chrome/common/extensions/docs/static/experimental.processes.html diff --git a/chrome/common/extensions/docs/static/i18n-messages.html b/chrome/common/extensions/docs/static/i18n-messages.html index 2a4b9b9..2a4b9b9 100755..100644 --- a/chrome/common/extensions/docs/static/i18n-messages.html +++ b/chrome/common/extensions/docs/static/i18n-messages.html diff --git a/chrome/common/extensions/docs/static/pageAction.html b/chrome/common/extensions/docs/static/pageAction.html index 0c515b9..0c515b9 100755..100644 --- a/chrome/common/extensions/docs/static/pageAction.html +++ b/chrome/common/extensions/docs/static/pageAction.html diff --git a/chrome/common/extensions/docs/static/tut_oauth.html b/chrome/common/extensions/docs/static/tut_oauth.html index 023d839..023d839 100755..100644 --- a/chrome/common/extensions/docs/static/tut_oauth.html +++ b/chrome/common/extensions/docs/static/tut_oauth.html |
