diff options
55 files changed, 95 insertions, 95 deletions
diff --git a/chrome/DEPS b/chrome/DEPS index bb61606..bb61606 100755..100644 --- a/chrome/DEPS +++ b/chrome/DEPS diff --git a/chrome/app/theme/new_browser_window.png b/chrome/app/theme/new_browser_window.png Binary files differindex 6ed666b..6ed666b 100755..100644 --- a/chrome/app/theme/new_browser_window.png +++ b/chrome/app/theme/new_browser_window.png diff --git a/chrome/app/theme/tab_overview.png b/chrome/app/theme/tab_overview.png Binary files differindex a6afc03..a6afc03 100755..100644 --- a/chrome/app/theme/tab_overview.png +++ b/chrome/app/theme/tab_overview.png diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index d5be2b8..d5be2b8 100755..100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index f386960..f386960 100755..100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc index 84753d9..84753d9 100755..100644 --- a/chrome/browser/browser_prefs.cc +++ b/chrome/browser/browser_prefs.cc diff --git a/chrome/browser/extensions/extension_bookmarks_module_constants.cc b/chrome/browser/extensions/extension_bookmarks_module_constants.cc index cdf602d..cdf602d 100755..100644 --- a/chrome/browser/extensions/extension_bookmarks_module_constants.cc +++ b/chrome/browser/extensions/extension_bookmarks_module_constants.cc diff --git a/chrome/browser/extensions/extension_bookmarks_module_constants.h b/chrome/browser/extensions/extension_bookmarks_module_constants.h index 3b504e6..3b504e6 100755..100644 --- a/chrome/browser/extensions/extension_bookmarks_module_constants.h +++ b/chrome/browser/extensions/extension_bookmarks_module_constants.h diff --git a/chrome/browser/extensions/extension_creator.cc b/chrome/browser/extensions/extension_creator.cc index 9abd030..9abd030 100755..100644 --- a/chrome/browser/extensions/extension_creator.cc +++ b/chrome/browser/extensions/extension_creator.cc diff --git a/chrome/browser/extensions/extension_creator.h b/chrome/browser/extensions/extension_creator.h index e2446e3..e2446e3 100755..100644 --- a/chrome/browser/extensions/extension_creator.h +++ b/chrome/browser/extensions/extension_creator.h diff --git a/chrome/browser/extensions/extension_event_names.cc b/chrome/browser/extensions/extension_event_names.cc index f4fd6e7..f4fd6e7 100755..100644 --- a/chrome/browser/extensions/extension_event_names.cc +++ b/chrome/browser/extensions/extension_event_names.cc diff --git a/chrome/browser/extensions/extension_event_names.h b/chrome/browser/extensions/extension_event_names.h index 9b9e3f2..9b9e3f2 100755..100644 --- a/chrome/browser/extensions/extension_event_names.h +++ b/chrome/browser/extensions/extension_event_names.h diff --git a/chrome/browser/extensions/extension_page_actions_module_constants.cc b/chrome/browser/extensions/extension_page_actions_module_constants.cc index 2b54f1b..2b54f1b 100755..100644 --- a/chrome/browser/extensions/extension_page_actions_module_constants.cc +++ b/chrome/browser/extensions/extension_page_actions_module_constants.cc diff --git a/chrome/browser/extensions/extension_page_actions_module_constants.h b/chrome/browser/extensions/extension_page_actions_module_constants.h index 91db0d8..91db0d8 100755..100644 --- a/chrome/browser/extensions/extension_page_actions_module_constants.h +++ b/chrome/browser/extensions/extension_page_actions_module_constants.h diff --git a/chrome/browser/extensions/extension_tabs_module_constants.cc b/chrome/browser/extensions/extension_tabs_module_constants.cc index 69676e7..69676e7 100755..100644 --- a/chrome/browser/extensions/extension_tabs_module_constants.cc +++ b/chrome/browser/extensions/extension_tabs_module_constants.cc diff --git a/chrome/browser/extensions/extension_tabs_module_constants.h b/chrome/browser/extensions/extension_tabs_module_constants.h index 4df84c8..4df84c8 100755..100644 --- a/chrome/browser/extensions/extension_tabs_module_constants.h +++ b/chrome/browser/extensions/extension_tabs_module_constants.h diff --git a/chrome/browser/gtk/sad_tab_gtk.cc b/chrome/browser/gtk/sad_tab_gtk.cc index 82fe8f2..82fe8f2 100755..100644 --- a/chrome/browser/gtk/sad_tab_gtk.cc +++ b/chrome/browser/gtk/sad_tab_gtk.cc diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc index 78ddcc4..78ddcc4 100755..100644 --- a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc index 2648964..2648964 100755..100644 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc diff --git a/chrome/browser/login_prompt.cc b/chrome/browser/login_prompt.cc index b897378..b897378 100755..100644 --- a/chrome/browser/login_prompt.cc +++ b/chrome/browser/login_prompt.cc diff --git a/chrome/browser/renderer_host/render_widget_host_painting_observer.h b/chrome/browser/renderer_host/render_widget_host_painting_observer.h index d24b61a..d24b61a 100755..100644 --- a/chrome/browser/renderer_host/render_widget_host_painting_observer.h +++ b/chrome/browser/renderer_host/render_widget_host_painting_observer.h diff --git a/chrome/browser/renderer_host/test/render_view_host_manager_browsertest.cc b/chrome/browser/renderer_host/test/render_view_host_manager_browsertest.cc index 6550b57..6550b57 100755..100644 --- a/chrome/browser/renderer_host/test/render_view_host_manager_browsertest.cc +++ b/chrome/browser/renderer_host/test/render_view_host_manager_browsertest.cc diff --git a/chrome/browser/tab_contents/thumbnail_generator.cc b/chrome/browser/tab_contents/thumbnail_generator.cc index 9f80c57..9f80c57 100755..100644 --- a/chrome/browser/tab_contents/thumbnail_generator.cc +++ b/chrome/browser/tab_contents/thumbnail_generator.cc diff --git a/chrome/browser/tab_contents/thumbnail_generator.h b/chrome/browser/tab_contents/thumbnail_generator.h index d3d3d15..d3d3d15 100755..100644 --- a/chrome/browser/tab_contents/thumbnail_generator.h +++ b/chrome/browser/tab_contents/thumbnail_generator.h diff --git a/chrome/browser/tab_contents/thumbnail_generator_unittest.cc b/chrome/browser/tab_contents/thumbnail_generator_unittest.cc index 160a377..160a377 100755..100644 --- a/chrome/browser/tab_contents/thumbnail_generator_unittest.cc +++ b/chrome/browser/tab_contents/thumbnail_generator_unittest.cc diff --git a/chrome/browser/views/tab_contents/tab_contents_view_win.cc b/chrome/browser/views/tab_contents/tab_contents_view_win.cc index 0026c6b..0026c6b 100755..100644 --- a/chrome/browser/views/tab_contents/tab_contents_view_win.cc +++ b/chrome/browser/views/tab_contents/tab_contents_view_win.cc diff --git a/chrome/common/extensions/extension_error_utils.cc b/chrome/common/extensions/extension_error_utils.cc index 724cdcd..724cdcd 100755..100644 --- a/chrome/common/extensions/extension_error_utils.cc +++ b/chrome/common/extensions/extension_error_utils.cc diff --git a/chrome/common/extensions/extension_error_utils.h b/chrome/common/extensions/extension_error_utils.h index f9f1e7c..f9f1e7c 100755..100644 --- a/chrome/common/extensions/extension_error_utils.h +++ b/chrome/common/extensions/extension_error_utils.h diff --git a/chrome/common/transport_dib.h b/chrome/common/transport_dib.h index 5712827..5712827 100755..100644 --- a/chrome/common/transport_dib.h +++ b/chrome/common/transport_dib.h diff --git a/chrome/common/transport_dib_linux.cc b/chrome/common/transport_dib_linux.cc index 1037341..1037341 100755..100644 --- a/chrome/common/transport_dib_linux.cc +++ b/chrome/common/transport_dib_linux.cc diff --git a/chrome/common/transport_dib_mac.cc b/chrome/common/transport_dib_mac.cc index 9ce5e4f..9ce5e4f 100755..100644 --- a/chrome/common/transport_dib_mac.cc +++ b/chrome/common/transport_dib_mac.cc diff --git a/chrome/common/transport_dib_win.cc b/chrome/common/transport_dib_win.cc index 41fe925..41fe925 100755..100644 --- a/chrome/common/transport_dib_win.cc +++ b/chrome/common/transport_dib_win.cc diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS index d5673d2..d5673d2 100755..100644 --- a/chrome/renderer/DEPS +++ b/chrome/renderer/DEPS diff --git a/chrome/test/data/extensions/bad/Preferences b/chrome/test/data/extensions/bad/Preferences index e5eb8ac..5ce4d84 100755..100644 --- a/chrome/test/data/extensions/bad/Preferences +++ b/chrome/test/data/extensions/bad/Preferences @@ -1,26 +1,26 @@ -{
- "extensions": {
- "settings": {
- "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": {
- "location": 1,
- "path": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/1",
- "state": 1
- },
- "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb": {
- "location": 1,
- "path": "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/1",
- "state": 1
- },
- "bjafgdebaacbbbecmhlhpofkepfkgcpa": {
- "location": 1,
- "path": "bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0",
- "state": 1
- },
- "cccccccccccccccccccccccccccccccc": {
- "location": 1,
- "path": "cccccccccccccccccccccccccccccccc/1.0",
- "state": 1
- }
- }
- }
-}
+{ + "extensions": { + "settings": { + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": { + "location": 1, + "path": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/1", + "state": 1 + }, + "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb": { + "location": 1, + "path": "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/1", + "state": 1 + }, + "bjafgdebaacbbbecmhlhpofkepfkgcpa": { + "location": 1, + "path": "bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0", + "state": 1 + }, + "cccccccccccccccccccccccccccccccc": { + "location": 1, + "path": "cccccccccccccccccccccccccccccccc/1.0", + "state": 1 + } + } + } +} diff --git a/chrome/test/data/extensions/bad_magic.crx b/chrome/test/data/extensions/bad_magic.crx Binary files differindex 4323013..4323013 100755..100644 --- a/chrome/test/data/extensions/bad_magic.crx +++ b/chrome/test/data/extensions/bad_magic.crx diff --git a/chrome/test/data/extensions/bad_signature.crx b/chrome/test/data/extensions/bad_signature.crx Binary files differindex d5a6033..d5a6033 100755..100644 --- a/chrome/test/data/extensions/bad_signature.crx +++ b/chrome/test/data/extensions/bad_signature.crx diff --git a/chrome/test/data/extensions/good.pem b/chrome/test/data/extensions/good.pem index eb40bdaa..eb40bdaa 100755..100644 --- a/chrome/test/data/extensions/good.pem +++ b/chrome/test/data/extensions/good.pem diff --git a/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/page.html b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/page.html index 5b039a3..5b039a3 100755..100644 --- a/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/page.html +++ b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/page.html diff --git a/chrome/test/data/extensions/good/Preferences b/chrome/test/data/extensions/good/Preferences index b0c0012..f65cf48 100755..100644 --- a/chrome/test/data/extensions/good/Preferences +++ b/chrome/test/data/extensions/good/Preferences @@ -1,21 +1,21 @@ -{
- "extensions": {
- "settings": {
- "behllobkkfkfnphdnhnkndlbkcpglgmj": {
- "location": 1,
- "path": "behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0",
- "state": 1
- },
- "bjafgdebaacbbbecmhlhpofkepfkgcpa": {
- "location": 1,
- "path": "bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0",
- "state": 1
- },
- "hpiknbiabeeppbpihjehijgoemciehgk": {
- "location": 1,
- "path": "hpiknbiabeeppbpihjehijgoemciehgk/2",
- "state": 1
- }
- }
- }
-}
+{ + "extensions": { + "settings": { + "behllobkkfkfnphdnhnkndlbkcpglgmj": { + "location": 1, + "path": "behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0", + "state": 1 + }, + "bjafgdebaacbbbecmhlhpofkepfkgcpa": { + "location": 1, + "path": "bjafgdebaacbbbecmhlhpofkepfkgcpa/1.0", + "state": 1 + }, + "hpiknbiabeeppbpihjehijgoemciehgk": { + "location": 1, + "path": "hpiknbiabeeppbpihjehijgoemciehgk/2", + "state": 1 + } + } + } +} diff --git a/chrome/test/data/extensions/good2.crx b/chrome/test/data/extensions/good2.crx Binary files differindex 26a1dfa..26a1dfa 100755..100644 --- a/chrome/test/data/extensions/good2.crx +++ b/chrome/test/data/extensions/good2.crx diff --git a/chrome/test/data/extensions/samples/getviews/bg.html b/chrome/test/data/extensions/samples/getviews/bg.html index cdfbf58..92291eb 100755..100644 --- a/chrome/test/data/extensions/samples/getviews/bg.html +++ b/chrome/test/data/extensions/samples/getviews/bg.html @@ -1,9 +1,9 @@ -<html>
- <head>
- <link rel="stylesheet" type="text/css" href="common.css">
- <script src="common.js" type="text/javascript"></script>
- </head>
- <body>
- <div span id="me" onclick="claim();">Background Page</div>
- </body>
+<html> + <head> + <link rel="stylesheet" type="text/css" href="common.css"> + <script src="common.js" type="text/javascript"></script> + </head> + <body> + <div span id="me" onclick="claim();">Background Page</div> + </body> </html>
\ No newline at end of file diff --git a/chrome/test/data/extensions/samples/getviews/common.css b/chrome/test/data/extensions/samples/getviews/common.css index 99d72a0..432dd6d 100755..100644 --- a/chrome/test/data/extensions/samples/getviews/common.css +++ b/chrome/test/data/extensions/samples/getviews/common.css @@ -1,10 +1,10 @@ -body {
- font-size: 18px;
-}
-
-.strong {
- background-color: red;
-}
-.weak {
- color: pink;
+body { + font-size: 18px; +} + +.strong { + background-color: red; +} +.weak { + color: pink; }
\ No newline at end of file diff --git a/chrome/test/data/extensions/samples/getviews/common.js b/chrome/test/data/extensions/samples/getviews/common.js index e567088..0ca0b9a 100755..100644 --- a/chrome/test/data/extensions/samples/getviews/common.js +++ b/chrome/test/data/extensions/samples/getviews/common.js @@ -1,15 +1,15 @@ -function claim() {
- var views = chrome.self.getViews();
- for (var i = 0; i < views.length; i++) {
- views[i].respond(document.getElementById("me").innerHTML);
- }
-}
-
-function respond(val) {
- var me = document.getElementById("me");
- if (val == me.innerHTML) {
- me.className = "strong";
- } else {
- me.className = "weak";
- }
+function claim() { + var views = chrome.self.getViews(); + for (var i = 0; i < views.length; i++) { + views[i].respond(document.getElementById("me").innerHTML); + } +} + +function respond(val) { + var me = document.getElementById("me"); + if (val == me.innerHTML) { + me.className = "strong"; + } else { + me.className = "weak"; + } }
\ No newline at end of file diff --git a/chrome/test/data/extensions/samples/getviews/manifest.json b/chrome/test/data/extensions/samples/getviews/manifest.json index 84e18b1..84e18b1 100755..100644 --- a/chrome/test/data/extensions/samples/getviews/manifest.json +++ b/chrome/test/data/extensions/samples/getviews/manifest.json diff --git a/chrome/test/data/extensions/samples/getviews/ts1.html b/chrome/test/data/extensions/samples/getviews/ts1.html index df2b006..ce0c115 100755..100644 --- a/chrome/test/data/extensions/samples/getviews/ts1.html +++ b/chrome/test/data/extensions/samples/getviews/ts1.html @@ -1,9 +1,9 @@ -<html>
- <head>
- <link rel="stylesheet" type="text/css" href="common.css">
- <script src="common.js" type="text/javascript"></script>
- </head>
- <body>
- <div span id="me" onclick="claim();">Toolstrip 1</div>
- </body>
+<html> + <head> + <link rel="stylesheet" type="text/css" href="common.css"> + <script src="common.js" type="text/javascript"></script> + </head> + <body> + <div span id="me" onclick="claim();">Toolstrip 1</div> + </body> </html>
\ No newline at end of file diff --git a/chrome/test/data/extensions/samples/getviews/ts2.html b/chrome/test/data/extensions/samples/getviews/ts2.html index f5ee37e..21d6c48 100755..100644 --- a/chrome/test/data/extensions/samples/getviews/ts2.html +++ b/chrome/test/data/extensions/samples/getviews/ts2.html @@ -1,9 +1,9 @@ -<html>
- <head>
- <link rel="stylesheet" type="text/css" href="common.css">
- <script src="common.js" type="text/javascript"></script>
- </head>
- <body>
- <div span id="me" onclick="claim();">Toolstrip 2</div>
- </body>
+<html> + <head> + <link rel="stylesheet" type="text/css" href="common.css"> + <script src="common.js" type="text/javascript"></script> + </head> + <body> + <div span id="me" onclick="claim();">Toolstrip 2</div> + </body> </html>
\ No newline at end of file diff --git a/chrome/test/data/extensions/test_file.html b/chrome/test/data/extensions/test_file.html index 9718b43..d3cdf0a 100755..100644 --- a/chrome/test/data/extensions/test_file.html +++ b/chrome/test/data/extensions/test_file.html @@ -1 +1 @@ -<title>Unmodified</title>
+<title>Unmodified</title> diff --git a/chrome/test/data/extensions/theme_with_missing_image.crx b/chrome/test/data/extensions/theme_with_missing_image.crx Binary files differindex 8f9b355..8f9b355 100755..100644 --- a/chrome/test/data/extensions/theme_with_missing_image.crx +++ b/chrome/test/data/extensions/theme_with_missing_image.crx diff --git a/chrome/test/data/extensions/uitest/event_sink/manifest.json b/chrome/test/data/extensions/uitest/event_sink/manifest.json index 830243d..830243d 100755..100644 --- a/chrome/test/data/extensions/uitest/event_sink/manifest.json +++ b/chrome/test/data/extensions/uitest/event_sink/manifest.json diff --git a/chrome/test/data/extensions/uitest/event_sink/test.html b/chrome/test/data/extensions/uitest/event_sink/test.html index 2520d48..2520d48 100755..100644 --- a/chrome/test/data/extensions/uitest/event_sink/test.html +++ b/chrome/test/data/extensions/uitest/event_sink/test.html diff --git a/chrome/test/data/zip/test.zip b/chrome/test/data/zip/test.zip Binary files differindex e32f108..e32f108 100755..100644 --- a/chrome/test/data/zip/test.zip +++ b/chrome/test/data/zip/test.zip diff --git a/chrome/test/data/zip/test_nocompress.zip b/chrome/test/data/zip/test_nocompress.zip Binary files differindex f95e1d2..f95e1d2 100755..100644 --- a/chrome/test/data/zip/test_nocompress.zip +++ b/chrome/test/data/zip/test_nocompress.zip diff --git a/net/data/url_request_unittest/redirect307-to-echoall b/net/data/url_request_unittest/redirect307-to-echoall index 7898192..7898192 100755..100644 --- a/net/data/url_request_unittest/redirect307-to-echoall +++ b/net/data/url_request_unittest/redirect307-to-echoall diff --git a/net/data/url_request_unittest/redirect307-to-echoall.mock-http-headers b/net/data/url_request_unittest/redirect307-to-echoall.mock-http-headers index 33393cc..33393cc 100755..100644 --- a/net/data/url_request_unittest/redirect307-to-echoall.mock-http-headers +++ b/net/data/url_request_unittest/redirect307-to-echoall.mock-http-headers diff --git a/sandbox/tools/launcher/launcher.vcproj b/sandbox/tools/launcher/launcher.vcproj index 71ed011..71ed011 100755..100644 --- a/sandbox/tools/launcher/launcher.vcproj +++ b/sandbox/tools/launcher/launcher.vcproj |
