diff --git a/.gitignore b/.gitignore index 198964edf..b616a5166 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,10 @@ .DS_Store +.project .svn +atom-build atom.xcodeproj build atom-build .xcodebuild-info +node_modules +npm-debug.log diff --git a/Rakefile b/Rakefile index dcc867ef2..f177b83b2 100644 --- a/Rakefile +++ b/Rakefile @@ -1,24 +1,21 @@ require 'timeout' $ATOM_ARGS = [] +ENV['PATH'] = "#{ENV['PATH']}:/opt/github/bin/" -ENV['PATH'] = "#{ENV['PATH']}:/usr/local/bin/" +COFFEE_PATH = "node_modules/.bin/coffee" BUILD_DIR = 'atom-build' desc "Create xcode project from gpy file" task "create-project" do `rm -rf atom.xcodeproj` `python tools/gyp/gyp --depth=. atom.gyp` - # `killall -c Xcode -9 2> /dev/null ` - # `open atom.xcodeproj` # In order for the xcodebuild to know about the schemes, the project needs to have been opened once. This is xcode bullshit and is a bug on Apple's end (No radar has been file because I have no faith in radar's) - Timeout::timeout(10) do - sleep 0 while `xcodebuild -list` =~ /This project contains no schemes./ # Give xcode some time to open - end end desc "Build Atom via `xcodebuild`" -task :build => ["create-project", "verify-prerequisites"] do - command = "xcodebuild -target Atom -configuration Debug -scheme Atom" # -scheme is required, otherwise xcodebuild creates a binary that won't run on Corey's Air. He recieves the error "Check failed: !loaded_locale.empty(). Locale could not be found for en-US" +task :build => "create-project" do + command = "xcodebuild -target Atom configuration=Release SYMROOT=#{BUILD_DIR}" + puts command output = `#{command}` if $?.exitstatus != 0 $stderr.puts "Error #{$?.exitstatus}:\n#{output}" @@ -89,7 +86,8 @@ task :nof do system %{find . -name *spec.coffee | xargs sed -E -i "" "s/f+(it|describe) +(['\\"])/\\1 \\2/g"} end -task "copy-files-to-bundle" => ["verify-prerequisites", "create-xcodebuild-info"] do +desc "Copy files to bundle and compile CoffeeScripts" +task :"copy-files-to-bundle" do project_dir = ENV['PROJECT_DIR'] || '.' built_dir = ENV['BUILT_PRODUCTS_DIR'] || '.' contents_dir = ENV['CONTENTS_FOLDER_PATH'] @@ -104,19 +102,7 @@ task "copy-files-to-bundle" => ["verify-prerequisites", "create-xcodebuild-info" rm_rf dest_path cp_r dir, dest_path - `coffee -c '#{dest_path.gsub(" ", "\\ ")}'` - end -end - -task "create-xcodebuild-info" do - `echo $TARGET_BUILD_DIR/$FULL_PRODUCT_NAME > .xcodebuild-info` -end - -task :"verify-prerequisites" do - `hash coffee` - if not $?.success? - abort "error: coffee is required but it's not installed - " + - "http://coffeescript.org/ - (try `npm i -g coffee-script`)" + `#{COFFEE_PATH} -c '#{dest_path.gsub(" ", "\\ ")}'` end end diff --git a/atom.gyp b/atom.gyp index 6c03d9b38..bf98642c0 100644 --- a/atom.gyp +++ b/atom.gyp @@ -143,9 +143,7 @@ { 'postbuild_name': 'Copy and Compile Static Files', 'action': [ - 'rake', - '--trace', - 'copy-files-to-bundle', + 'script/copy-files-to-bundle' ], }, { @@ -172,7 +170,7 @@ 'action': [ 'cp', '-r', - 'cef/resources', + 'cef/Resources', '${BUILT_PRODUCTS_DIR}/Atom.app/Contents/Frameworks/Chromium Embedded Framework.framework/' ], }, @@ -325,9 +323,7 @@ { 'postbuild_name': 'Copy and Compile Static Files', 'action': [ - 'rake', - '--trace', - 'copy-files-to-bundle', + 'script/copy-files-to-bundle' ], }, ], diff --git a/cef/resources/aliasCursor.png b/cef/Resources/aliasCursor.png similarity index 100% rename from cef/resources/aliasCursor.png rename to cef/Resources/aliasCursor.png diff --git a/cef/Resources/am.lproj/locale.pak b/cef/Resources/am.lproj/locale.pak new file mode 100644 index 000000000..b120fe81b Binary files /dev/null and b/cef/Resources/am.lproj/locale.pak differ diff --git a/cef/Resources/ar.lproj/locale.pak b/cef/Resources/ar.lproj/locale.pak new file mode 100644 index 000000000..68606efea Binary files /dev/null and b/cef/Resources/ar.lproj/locale.pak differ diff --git a/cef/Resources/bg.lproj/locale.pak b/cef/Resources/bg.lproj/locale.pak new file mode 100644 index 000000000..75bc00bca Binary files /dev/null and b/cef/Resources/bg.lproj/locale.pak differ diff --git a/cef/Resources/bn.lproj/locale.pak b/cef/Resources/bn.lproj/locale.pak new file mode 100644 index 000000000..ab46dad96 Binary files /dev/null and b/cef/Resources/bn.lproj/locale.pak differ diff --git a/cef/Resources/ca.lproj/locale.pak b/cef/Resources/ca.lproj/locale.pak new file mode 100644 index 000000000..c710520d8 Binary files /dev/null and b/cef/Resources/ca.lproj/locale.pak differ diff --git a/cef/Resources/cef.pak b/cef/Resources/cef.pak new file mode 100644 index 000000000..0b10931a0 Binary files /dev/null and b/cef/Resources/cef.pak differ diff --git a/cef/resources/cellCursor.png b/cef/Resources/cellCursor.png similarity index 100% rename from cef/resources/cellCursor.png rename to cef/Resources/cellCursor.png diff --git a/cef/resources/contextMenuCursor.png b/cef/Resources/contextMenuCursor.png similarity index 100% rename from cef/resources/contextMenuCursor.png rename to cef/Resources/contextMenuCursor.png diff --git a/cef/resources/copyCursor.png b/cef/Resources/copyCursor.png similarity index 100% rename from cef/resources/copyCursor.png rename to cef/Resources/copyCursor.png diff --git a/cef/Resources/cs.lproj/locale.pak b/cef/Resources/cs.lproj/locale.pak new file mode 100644 index 000000000..a1ec23eb9 Binary files /dev/null and b/cef/Resources/cs.lproj/locale.pak differ diff --git a/cef/Resources/da.lproj/locale.pak b/cef/Resources/da.lproj/locale.pak new file mode 100644 index 000000000..492f807a4 Binary files /dev/null and b/cef/Resources/da.lproj/locale.pak differ diff --git a/cef/Resources/de.lproj/locale.pak b/cef/Resources/de.lproj/locale.pak new file mode 100644 index 000000000..cf63de888 Binary files /dev/null and b/cef/Resources/de.lproj/locale.pak differ diff --git a/cef/resources/deleteButton.png b/cef/Resources/deleteButton.png similarity index 100% rename from cef/resources/deleteButton.png rename to cef/Resources/deleteButton.png diff --git a/cef/resources/deleteButton.tiff b/cef/Resources/deleteButton.tiff similarity index 100% rename from cef/resources/deleteButton.tiff rename to cef/Resources/deleteButton.tiff diff --git a/cef/resources/deleteButton@2x.png b/cef/Resources/deleteButton@2x.png similarity index 100% rename from cef/resources/deleteButton@2x.png rename to cef/Resources/deleteButton@2x.png diff --git a/cef/resources/deleteButtonPressed.png b/cef/Resources/deleteButtonPressed.png similarity index 100% rename from cef/resources/deleteButtonPressed.png rename to cef/Resources/deleteButtonPressed.png diff --git a/cef/resources/deleteButtonPressed.tiff b/cef/Resources/deleteButtonPressed.tiff similarity index 100% rename from cef/resources/deleteButtonPressed.tiff rename to cef/Resources/deleteButtonPressed.tiff diff --git a/cef/resources/deleteButtonPressed@2x.png b/cef/Resources/deleteButtonPressed@2x.png similarity index 100% rename from cef/resources/deleteButtonPressed@2x.png rename to cef/Resources/deleteButtonPressed@2x.png diff --git a/cef/resources/cef.pak b/cef/Resources/devtools_resources.pak similarity index 76% rename from cef/resources/cef.pak rename to cef/Resources/devtools_resources.pak index 5029411e5..8ef5fb690 100644 Binary files a/cef/resources/cef.pak and b/cef/Resources/devtools_resources.pak differ diff --git a/cef/resources/eastResizeCursor.png b/cef/Resources/eastResizeCursor.png similarity index 100% rename from cef/resources/eastResizeCursor.png rename to cef/Resources/eastResizeCursor.png diff --git a/cef/resources/eastWestResizeCursor.png b/cef/Resources/eastWestResizeCursor.png similarity index 100% rename from cef/resources/eastWestResizeCursor.png rename to cef/Resources/eastWestResizeCursor.png diff --git a/cef/Resources/el.lproj/locale.pak b/cef/Resources/el.lproj/locale.pak new file mode 100644 index 000000000..135b54d1b Binary files /dev/null and b/cef/Resources/el.lproj/locale.pak differ diff --git a/cef/Resources/en.lproj/locale.pak b/cef/Resources/en.lproj/locale.pak new file mode 100644 index 000000000..9e8e8a614 Binary files /dev/null and b/cef/Resources/en.lproj/locale.pak differ diff --git a/cef/Resources/en_GB.lproj/locale.pak b/cef/Resources/en_GB.lproj/locale.pak new file mode 100644 index 000000000..ee2755062 Binary files /dev/null and b/cef/Resources/en_GB.lproj/locale.pak differ diff --git a/cef/Resources/es.lproj/locale.pak b/cef/Resources/es.lproj/locale.pak new file mode 100644 index 000000000..ba69a5b14 Binary files /dev/null and b/cef/Resources/es.lproj/locale.pak differ diff --git a/cef/Resources/es_419.lproj/locale.pak b/cef/Resources/es_419.lproj/locale.pak new file mode 100644 index 000000000..6ee1340e4 Binary files /dev/null and b/cef/Resources/es_419.lproj/locale.pak differ diff --git a/cef/Resources/et.lproj/locale.pak b/cef/Resources/et.lproj/locale.pak new file mode 100644 index 000000000..dee01e6a1 Binary files /dev/null and b/cef/Resources/et.lproj/locale.pak differ diff --git a/cef/Resources/fa.lproj/locale.pak b/cef/Resources/fa.lproj/locale.pak new file mode 100644 index 000000000..d537b5f68 Binary files /dev/null and b/cef/Resources/fa.lproj/locale.pak differ diff --git a/cef/Resources/fi.lproj/locale.pak b/cef/Resources/fi.lproj/locale.pak new file mode 100644 index 000000000..d08da45ac Binary files /dev/null and b/cef/Resources/fi.lproj/locale.pak differ diff --git a/cef/Resources/fil.lproj/locale.pak b/cef/Resources/fil.lproj/locale.pak new file mode 100644 index 000000000..c233c020d Binary files /dev/null and b/cef/Resources/fil.lproj/locale.pak differ diff --git a/cef/Resources/fr.lproj/locale.pak b/cef/Resources/fr.lproj/locale.pak new file mode 100644 index 000000000..07b2c337b Binary files /dev/null and b/cef/Resources/fr.lproj/locale.pak differ diff --git a/cef/Resources/gu.lproj/locale.pak b/cef/Resources/gu.lproj/locale.pak new file mode 100644 index 000000000..35b32bd1f Binary files /dev/null and b/cef/Resources/gu.lproj/locale.pak differ diff --git a/cef/Resources/he.lproj/locale.pak b/cef/Resources/he.lproj/locale.pak new file mode 100644 index 000000000..ff6ce2264 Binary files /dev/null and b/cef/Resources/he.lproj/locale.pak differ diff --git a/cef/resources/helpCursor.png b/cef/Resources/helpCursor.png similarity index 100% rename from cef/resources/helpCursor.png rename to cef/Resources/helpCursor.png diff --git a/cef/Resources/hi.lproj/locale.pak b/cef/Resources/hi.lproj/locale.pak new file mode 100644 index 000000000..8fa070a5d Binary files /dev/null and b/cef/Resources/hi.lproj/locale.pak differ diff --git a/cef/Resources/hr.lproj/locale.pak b/cef/Resources/hr.lproj/locale.pak new file mode 100644 index 000000000..81809d241 Binary files /dev/null and b/cef/Resources/hr.lproj/locale.pak differ diff --git a/cef/Resources/hu.lproj/locale.pak b/cef/Resources/hu.lproj/locale.pak new file mode 100644 index 000000000..ee4f3acdd Binary files /dev/null and b/cef/Resources/hu.lproj/locale.pak differ diff --git a/cef/Resources/id.lproj/locale.pak b/cef/Resources/id.lproj/locale.pak new file mode 100644 index 000000000..1b20ad866 Binary files /dev/null and b/cef/Resources/id.lproj/locale.pak differ diff --git a/cef/resources/inputSpeech.png b/cef/Resources/inputSpeech.png similarity index 100% rename from cef/resources/inputSpeech.png rename to cef/Resources/inputSpeech.png diff --git a/cef/resources/inputSpeech.tiff b/cef/Resources/inputSpeech.tiff similarity index 100% rename from cef/resources/inputSpeech.tiff rename to cef/Resources/inputSpeech.tiff diff --git a/cef/Resources/it.lproj/locale.pak b/cef/Resources/it.lproj/locale.pak new file mode 100644 index 000000000..330165006 Binary files /dev/null and b/cef/Resources/it.lproj/locale.pak differ diff --git a/cef/Resources/ja.lproj/locale.pak b/cef/Resources/ja.lproj/locale.pak new file mode 100644 index 000000000..199a569e9 Binary files /dev/null and b/cef/Resources/ja.lproj/locale.pak differ diff --git a/cef/Resources/kn.lproj/locale.pak b/cef/Resources/kn.lproj/locale.pak new file mode 100644 index 000000000..570c90ea7 Binary files /dev/null and b/cef/Resources/kn.lproj/locale.pak differ diff --git a/cef/Resources/ko.lproj/locale.pak b/cef/Resources/ko.lproj/locale.pak new file mode 100644 index 000000000..dab6374cb Binary files /dev/null and b/cef/Resources/ko.lproj/locale.pak differ diff --git a/cef/resources/linearSRGB.icc b/cef/Resources/linearSRGB.icc similarity index 100% rename from cef/resources/linearSRGB.icc rename to cef/Resources/linearSRGB.icc diff --git a/cef/resources/linkCursor.png b/cef/Resources/linkCursor.png similarity index 100% rename from cef/resources/linkCursor.png rename to cef/Resources/linkCursor.png diff --git a/cef/Resources/lt.lproj/locale.pak b/cef/Resources/lt.lproj/locale.pak new file mode 100644 index 000000000..a515b5829 Binary files /dev/null and b/cef/Resources/lt.lproj/locale.pak differ diff --git a/cef/Resources/lv.lproj/locale.pak b/cef/Resources/lv.lproj/locale.pak new file mode 100644 index 000000000..b08a25190 Binary files /dev/null and b/cef/Resources/lv.lproj/locale.pak differ diff --git a/cef/resources/missingImage.png b/cef/Resources/missingImage.png similarity index 100% rename from cef/resources/missingImage.png rename to cef/Resources/missingImage.png diff --git a/cef/resources/missingImage.tiff b/cef/Resources/missingImage.tiff similarity index 100% rename from cef/resources/missingImage.tiff rename to cef/Resources/missingImage.tiff diff --git a/cef/resources/missingImage@2x.png b/cef/Resources/missingImage@2x.png similarity index 100% rename from cef/resources/missingImage@2x.png rename to cef/Resources/missingImage@2x.png diff --git a/cef/Resources/ml.lproj/locale.pak b/cef/Resources/ml.lproj/locale.pak new file mode 100644 index 000000000..2999d96e6 Binary files /dev/null and b/cef/Resources/ml.lproj/locale.pak differ diff --git a/cef/resources/moveCursor.png b/cef/Resources/moveCursor.png similarity index 100% rename from cef/resources/moveCursor.png rename to cef/Resources/moveCursor.png diff --git a/cef/Resources/mr.lproj/locale.pak b/cef/Resources/mr.lproj/locale.pak new file mode 100644 index 000000000..7ca844d86 Binary files /dev/null and b/cef/Resources/mr.lproj/locale.pak differ diff --git a/cef/Resources/ms.lproj/locale.pak b/cef/Resources/ms.lproj/locale.pak new file mode 100644 index 000000000..84396543b Binary files /dev/null and b/cef/Resources/ms.lproj/locale.pak differ diff --git a/cef/Resources/nb.lproj/locale.pak b/cef/Resources/nb.lproj/locale.pak new file mode 100644 index 000000000..31ddd51e7 Binary files /dev/null and b/cef/Resources/nb.lproj/locale.pak differ diff --git a/cef/Resources/nl.lproj/locale.pak b/cef/Resources/nl.lproj/locale.pak new file mode 100644 index 000000000..a05537c2a Binary files /dev/null and b/cef/Resources/nl.lproj/locale.pak differ diff --git a/cef/resources/noDropCursor.png b/cef/Resources/noDropCursor.png similarity index 100% rename from cef/resources/noDropCursor.png rename to cef/Resources/noDropCursor.png diff --git a/cef/resources/noneCursor.png b/cef/Resources/noneCursor.png similarity index 100% rename from cef/resources/noneCursor.png rename to cef/Resources/noneCursor.png diff --git a/cef/resources/northEastResizeCursor.png b/cef/Resources/northEastResizeCursor.png similarity index 100% rename from cef/resources/northEastResizeCursor.png rename to cef/Resources/northEastResizeCursor.png diff --git a/cef/resources/northEastSouthWestResizeCursor.png b/cef/Resources/northEastSouthWestResizeCursor.png similarity index 100% rename from cef/resources/northEastSouthWestResizeCursor.png rename to cef/Resources/northEastSouthWestResizeCursor.png diff --git a/cef/resources/northResizeCursor.png b/cef/Resources/northResizeCursor.png similarity index 100% rename from cef/resources/northResizeCursor.png rename to cef/Resources/northResizeCursor.png diff --git a/cef/resources/northSouthResizeCursor.png b/cef/Resources/northSouthResizeCursor.png similarity index 100% rename from cef/resources/northSouthResizeCursor.png rename to cef/Resources/northSouthResizeCursor.png diff --git a/cef/resources/northWestResizeCursor.png b/cef/Resources/northWestResizeCursor.png similarity index 100% rename from cef/resources/northWestResizeCursor.png rename to cef/Resources/northWestResizeCursor.png diff --git a/cef/resources/northWestSouthEastResizeCursor.png b/cef/Resources/northWestSouthEastResizeCursor.png similarity index 100% rename from cef/resources/northWestSouthEastResizeCursor.png rename to cef/Resources/northWestSouthEastResizeCursor.png diff --git a/cef/resources/nullPlugin.png b/cef/Resources/nullPlugin.png similarity index 100% rename from cef/resources/nullPlugin.png rename to cef/Resources/nullPlugin.png diff --git a/cef/resources/nullPlugin@2x.png b/cef/Resources/nullPlugin@2x.png similarity index 100% rename from cef/resources/nullPlugin@2x.png rename to cef/Resources/nullPlugin@2x.png diff --git a/cef/resources/panIcon.png b/cef/Resources/panIcon.png similarity index 100% rename from cef/resources/panIcon.png rename to cef/Resources/panIcon.png diff --git a/cef/Resources/pl.lproj/locale.pak b/cef/Resources/pl.lproj/locale.pak new file mode 100644 index 000000000..7d669d755 Binary files /dev/null and b/cef/Resources/pl.lproj/locale.pak differ diff --git a/cef/resources/progressCursor.png b/cef/Resources/progressCursor.png similarity index 100% rename from cef/resources/progressCursor.png rename to cef/Resources/progressCursor.png diff --git a/cef/Resources/pt_BR.lproj/locale.pak b/cef/Resources/pt_BR.lproj/locale.pak new file mode 100644 index 000000000..8f13495e1 Binary files /dev/null and b/cef/Resources/pt_BR.lproj/locale.pak differ diff --git a/cef/Resources/pt_PT.lproj/locale.pak b/cef/Resources/pt_PT.lproj/locale.pak new file mode 100644 index 000000000..b9c91c89a Binary files /dev/null and b/cef/Resources/pt_PT.lproj/locale.pak differ diff --git a/cef/Resources/ro.lproj/locale.pak b/cef/Resources/ro.lproj/locale.pak new file mode 100644 index 000000000..207ca33b3 Binary files /dev/null and b/cef/Resources/ro.lproj/locale.pak differ diff --git a/cef/Resources/ru.lproj/locale.pak b/cef/Resources/ru.lproj/locale.pak new file mode 100644 index 000000000..fb2eae02b Binary files /dev/null and b/cef/Resources/ru.lproj/locale.pak differ diff --git a/cef/Resources/sk.lproj/locale.pak b/cef/Resources/sk.lproj/locale.pak new file mode 100644 index 000000000..ae3e965d0 Binary files /dev/null and b/cef/Resources/sk.lproj/locale.pak differ diff --git a/cef/Resources/sl.lproj/locale.pak b/cef/Resources/sl.lproj/locale.pak new file mode 100644 index 000000000..d108c3933 Binary files /dev/null and b/cef/Resources/sl.lproj/locale.pak differ diff --git a/cef/resources/southEastResizeCursor.png b/cef/Resources/southEastResizeCursor.png similarity index 100% rename from cef/resources/southEastResizeCursor.png rename to cef/Resources/southEastResizeCursor.png diff --git a/cef/resources/southResizeCursor.png b/cef/Resources/southResizeCursor.png similarity index 100% rename from cef/resources/southResizeCursor.png rename to cef/Resources/southResizeCursor.png diff --git a/cef/resources/southWestResizeCursor.png b/cef/Resources/southWestResizeCursor.png similarity index 100% rename from cef/resources/southWestResizeCursor.png rename to cef/Resources/southWestResizeCursor.png diff --git a/cef/Resources/sr.lproj/locale.pak b/cef/Resources/sr.lproj/locale.pak new file mode 100644 index 000000000..8a7561fe2 Binary files /dev/null and b/cef/Resources/sr.lproj/locale.pak differ diff --git a/cef/Resources/sv.lproj/locale.pak b/cef/Resources/sv.lproj/locale.pak new file mode 100644 index 000000000..0a7b1ed1b Binary files /dev/null and b/cef/Resources/sv.lproj/locale.pak differ diff --git a/cef/Resources/sw.lproj/locale.pak b/cef/Resources/sw.lproj/locale.pak new file mode 100644 index 000000000..42ce27180 Binary files /dev/null and b/cef/Resources/sw.lproj/locale.pak differ diff --git a/cef/Resources/ta.lproj/locale.pak b/cef/Resources/ta.lproj/locale.pak new file mode 100644 index 000000000..1406fe49d Binary files /dev/null and b/cef/Resources/ta.lproj/locale.pak differ diff --git a/cef/Resources/te.lproj/locale.pak b/cef/Resources/te.lproj/locale.pak new file mode 100644 index 000000000..ff762503f Binary files /dev/null and b/cef/Resources/te.lproj/locale.pak differ diff --git a/cef/resources/textAreaResizeCorner.png b/cef/Resources/textAreaResizeCorner.png similarity index 100% rename from cef/resources/textAreaResizeCorner.png rename to cef/Resources/textAreaResizeCorner.png diff --git a/cef/resources/textAreaResizeCorner.tiff b/cef/Resources/textAreaResizeCorner.tiff similarity index 100% rename from cef/resources/textAreaResizeCorner.tiff rename to cef/Resources/textAreaResizeCorner.tiff diff --git a/cef/resources/textAreaResizeCorner@2x.png b/cef/Resources/textAreaResizeCorner@2x.png similarity index 100% rename from cef/resources/textAreaResizeCorner@2x.png rename to cef/Resources/textAreaResizeCorner@2x.png diff --git a/cef/Resources/th.lproj/locale.pak b/cef/Resources/th.lproj/locale.pak new file mode 100644 index 000000000..93ee04e49 Binary files /dev/null and b/cef/Resources/th.lproj/locale.pak differ diff --git a/cef/Resources/tr.lproj/locale.pak b/cef/Resources/tr.lproj/locale.pak new file mode 100644 index 000000000..c8ad13ae5 Binary files /dev/null and b/cef/Resources/tr.lproj/locale.pak differ diff --git a/cef/Resources/uk.lproj/locale.pak b/cef/Resources/uk.lproj/locale.pak new file mode 100644 index 000000000..f587bdb3a Binary files /dev/null and b/cef/Resources/uk.lproj/locale.pak differ diff --git a/cef/resources/urlIcon.png b/cef/Resources/urlIcon.png similarity index 100% rename from cef/resources/urlIcon.png rename to cef/Resources/urlIcon.png diff --git a/cef/resources/verticalTextCursor.png b/cef/Resources/verticalTextCursor.png similarity index 100% rename from cef/resources/verticalTextCursor.png rename to cef/Resources/verticalTextCursor.png diff --git a/cef/Resources/vi.lproj/locale.pak b/cef/Resources/vi.lproj/locale.pak new file mode 100644 index 000000000..a721f6597 Binary files /dev/null and b/cef/Resources/vi.lproj/locale.pak differ diff --git a/cef/resources/waitCursor.png b/cef/Resources/waitCursor.png similarity index 100% rename from cef/resources/waitCursor.png rename to cef/Resources/waitCursor.png diff --git a/cef/resources/westResizeCursor.png b/cef/Resources/westResizeCursor.png similarity index 100% rename from cef/resources/westResizeCursor.png rename to cef/Resources/westResizeCursor.png diff --git a/cef/Resources/zh_CN.lproj/locale.pak b/cef/Resources/zh_CN.lproj/locale.pak new file mode 100644 index 000000000..94bd4bb4b Binary files /dev/null and b/cef/Resources/zh_CN.lproj/locale.pak differ diff --git a/cef/Resources/zh_TW.lproj/locale.pak b/cef/Resources/zh_TW.lproj/locale.pak new file mode 100644 index 000000000..dea56517f Binary files /dev/null and b/cef/Resources/zh_TW.lproj/locale.pak differ diff --git a/cef/resources/zoomInCursor.png b/cef/Resources/zoomInCursor.png similarity index 100% rename from cef/resources/zoomInCursor.png rename to cef/Resources/zoomInCursor.png diff --git a/cef/resources/zoomOutCursor.png b/cef/Resources/zoomOutCursor.png similarity index 100% rename from cef/resources/zoomOutCursor.png rename to cef/Resources/zoomOutCursor.png diff --git a/cef/cef_paths.gypi b/cef/cef_paths.gypi index ca5d06c37..42d90a249 100644 --- a/cef/cef_paths.gypi +++ b/cef/cef_paths.gypi @@ -216,6 +216,10 @@ 'cef/libcef_dll/cpptoc/v8exception_cpptoc.h', 'cef/libcef_dll/ctocpp/v8handler_ctocpp.cc', 'cef/libcef_dll/ctocpp/v8handler_ctocpp.h', + 'cef/libcef_dll/cpptoc/v8stack_frame_cpptoc.cc', + 'cef/libcef_dll/cpptoc/v8stack_frame_cpptoc.h', + 'cef/libcef_dll/cpptoc/v8stack_trace_cpptoc.cc', + 'cef/libcef_dll/cpptoc/v8stack_trace_cpptoc.h', 'cef/libcef_dll/cpptoc/v8value_cpptoc.cc', 'cef/libcef_dll/cpptoc/v8value_cpptoc.h', 'cef/libcef_dll/cpptoc/web_plugin_info_cpptoc.cc', @@ -346,6 +350,10 @@ 'cef/libcef_dll/ctocpp/v8exception_ctocpp.h', 'cef/libcef_dll/cpptoc/v8handler_cpptoc.cc', 'cef/libcef_dll/cpptoc/v8handler_cpptoc.h', + 'cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.cc', + 'cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.h', + 'cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc', + 'cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.h', 'cef/libcef_dll/ctocpp/v8value_ctocpp.cc', 'cef/libcef_dll/ctocpp/v8value_ctocpp.h', 'cef/libcef_dll/ctocpp/web_plugin_info_ctocpp.cc', diff --git a/cef/cef_paths2.gypi b/cef/cef_paths2.gypi index b81188a7b..7d6aa0b7c 100644 --- a/cef/cef_paths2.gypi +++ b/cef/cef_paths2.gypi @@ -88,7 +88,7 @@ 'tests/cefclient/client_app.h', 'tests/cefclient/client_app_delegates.cpp', 'tests/cefclient/client_handler.cpp', - 'tests/cefclient/atom_cef_client.h', + 'tests/cefclient/client_handler.h', 'tests/cefclient/client_renderer.cpp', 'tests/cefclient/client_renderer.h', 'tests/cefclient/client_switches.cpp', @@ -130,7 +130,7 @@ 'tests/cefclient/client_app.h', 'tests/cefclient/client_app_delegates.cpp', 'tests/cefclient/client_handler.cpp', - 'tests/cefclient/atom_cef_client.h', + 'tests/cefclient/client_handler.h', 'tests/cefclient/client_handler_mac.mm', 'tests/cefclient/client_renderer.cpp', 'tests/cefclient/client_renderer.h', @@ -166,6 +166,7 @@ ], 'cefclient_bundle_resources_linux': [ 'tests/cefclient/res/binding.html', + 'tests/cefclient/res/dialogs.html', 'tests/cefclient/res/domaccess.html', 'tests/cefclient/res/localstorage.html', 'tests/cefclient/res/logo.png', diff --git a/cef/frameworks/cef_paths.gypi b/cef/frameworks/cef_paths.gypi deleted file mode 100644 index a450bd61c..000000000 --- a/cef/frameworks/cef_paths.gypi +++ /dev/null @@ -1,363 +0,0 @@ -# Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights -# reserved. Use of this source code is governed by a BSD-style license that -# can be found in the LICENSE file. -# -# --------------------------------------------------------------------------- -# -# This file was generated by the CEF translator tool and should not edited -# by hand. See the translator.README.txt file in the tools directory for -# more information. -# - -{ - 'variables': { - 'autogen_cpp_includes': [ - 'include/cef_app.h', - 'include/cef_browser.h', - 'include/cef_browser_process_handler.h', - 'include/cef_callback.h', - 'include/cef_client.h', - 'include/cef_command_line.h', - 'include/cef_context_menu_handler.h', - 'include/cef_cookie.h', - 'include/cef_display_handler.h', - 'include/cef_dom.h', - 'include/cef_download_handler.h', - 'include/cef_download_item.h', - 'include/cef_focus_handler.h', - 'include/cef_frame.h', - 'include/cef_geolocation_handler.h', - 'include/cef_jsdialog_handler.h', - 'include/cef_keyboard_handler.h', - 'include/cef_life_span_handler.h', - 'include/cef_load_handler.h', - 'include/cef_menu_model.h', - 'include/cef_origin_whitelist.h', - 'include/cef_path_util.h', - 'include/cef_process_message.h', - 'include/cef_process_util.h', - 'include/cef_proxy_handler.h', - 'include/cef_render_process_handler.h', - 'include/cef_request.h', - 'include/cef_request_handler.h', - 'include/cef_resource_bundle_handler.h', - 'include/cef_resource_handler.h', - 'include/cef_response.h', - 'include/cef_scheme.h', - 'include/cef_stream.h', - 'include/cef_string_visitor.h', - 'include/cef_task.h', - 'include/cef_url.h', - 'include/cef_urlrequest.h', - 'include/cef_v8.h', - 'include/cef_values.h', - 'include/cef_web_plugin.h', - 'include/cef_xml_reader.h', - 'include/cef_zip_reader.h', - ], - 'autogen_capi_includes': [ - 'include/capi/cef_app_capi.h', - 'include/capi/cef_browser_capi.h', - 'include/capi/cef_browser_process_handler_capi.h', - 'include/capi/cef_callback_capi.h', - 'include/capi/cef_client_capi.h', - 'include/capi/cef_command_line_capi.h', - 'include/capi/cef_context_menu_handler_capi.h', - 'include/capi/cef_cookie_capi.h', - 'include/capi/cef_display_handler_capi.h', - 'include/capi/cef_dom_capi.h', - 'include/capi/cef_download_handler_capi.h', - 'include/capi/cef_download_item_capi.h', - 'include/capi/cef_focus_handler_capi.h', - 'include/capi/cef_frame_capi.h', - 'include/capi/cef_geolocation_handler_capi.h', - 'include/capi/cef_jsdialog_handler_capi.h', - 'include/capi/cef_keyboard_handler_capi.h', - 'include/capi/cef_life_span_handler_capi.h', - 'include/capi/cef_load_handler_capi.h', - 'include/capi/cef_menu_model_capi.h', - 'include/capi/cef_origin_whitelist_capi.h', - 'include/capi/cef_path_util_capi.h', - 'include/capi/cef_process_message_capi.h', - 'include/capi/cef_process_util_capi.h', - 'include/capi/cef_proxy_handler_capi.h', - 'include/capi/cef_render_process_handler_capi.h', - 'include/capi/cef_request_capi.h', - 'include/capi/cef_request_handler_capi.h', - 'include/capi/cef_resource_bundle_handler_capi.h', - 'include/capi/cef_resource_handler_capi.h', - 'include/capi/cef_response_capi.h', - 'include/capi/cef_scheme_capi.h', - 'include/capi/cef_stream_capi.h', - 'include/capi/cef_string_visitor_capi.h', - 'include/capi/cef_task_capi.h', - 'include/capi/cef_url_capi.h', - 'include/capi/cef_urlrequest_capi.h', - 'include/capi/cef_v8_capi.h', - 'include/capi/cef_values_capi.h', - 'include/capi/cef_web_plugin_capi.h', - 'include/capi/cef_xml_reader_capi.h', - 'include/capi/cef_zip_reader_capi.h', - ], - 'autogen_library_side': [ - 'libcef_dll/ctocpp/app_ctocpp.cc', - 'libcef_dll/ctocpp/app_ctocpp.h', - 'libcef_dll/cpptoc/auth_callback_cpptoc.cc', - 'libcef_dll/cpptoc/auth_callback_cpptoc.h', - 'libcef_dll/cpptoc/before_download_callback_cpptoc.cc', - 'libcef_dll/cpptoc/before_download_callback_cpptoc.h', - 'libcef_dll/cpptoc/binary_value_cpptoc.cc', - 'libcef_dll/cpptoc/binary_value_cpptoc.h', - 'libcef_dll/cpptoc/browser_cpptoc.cc', - 'libcef_dll/cpptoc/browser_cpptoc.h', - 'libcef_dll/cpptoc/browser_host_cpptoc.cc', - 'libcef_dll/cpptoc/browser_host_cpptoc.h', - 'libcef_dll/ctocpp/browser_process_handler_ctocpp.cc', - 'libcef_dll/ctocpp/browser_process_handler_ctocpp.h', - 'libcef_dll/cpptoc/callback_cpptoc.cc', - 'libcef_dll/cpptoc/callback_cpptoc.h', - 'libcef_dll/ctocpp/client_ctocpp.cc', - 'libcef_dll/ctocpp/client_ctocpp.h', - 'libcef_dll/cpptoc/command_line_cpptoc.cc', - 'libcef_dll/cpptoc/command_line_cpptoc.h', - 'libcef_dll/ctocpp/context_menu_handler_ctocpp.cc', - 'libcef_dll/ctocpp/context_menu_handler_ctocpp.h', - 'libcef_dll/cpptoc/context_menu_params_cpptoc.cc', - 'libcef_dll/cpptoc/context_menu_params_cpptoc.h', - 'libcef_dll/cpptoc/cookie_manager_cpptoc.cc', - 'libcef_dll/cpptoc/cookie_manager_cpptoc.h', - 'libcef_dll/ctocpp/cookie_visitor_ctocpp.cc', - 'libcef_dll/ctocpp/cookie_visitor_ctocpp.h', - 'libcef_dll/cpptoc/domdocument_cpptoc.cc', - 'libcef_dll/cpptoc/domdocument_cpptoc.h', - 'libcef_dll/cpptoc/domevent_cpptoc.cc', - 'libcef_dll/cpptoc/domevent_cpptoc.h', - 'libcef_dll/ctocpp/domevent_listener_ctocpp.cc', - 'libcef_dll/ctocpp/domevent_listener_ctocpp.h', - 'libcef_dll/cpptoc/domnode_cpptoc.cc', - 'libcef_dll/cpptoc/domnode_cpptoc.h', - 'libcef_dll/ctocpp/domvisitor_ctocpp.cc', - 'libcef_dll/ctocpp/domvisitor_ctocpp.h', - 'libcef_dll/cpptoc/dictionary_value_cpptoc.cc', - 'libcef_dll/cpptoc/dictionary_value_cpptoc.h', - 'libcef_dll/ctocpp/display_handler_ctocpp.cc', - 'libcef_dll/ctocpp/display_handler_ctocpp.h', - 'libcef_dll/ctocpp/download_handler_ctocpp.cc', - 'libcef_dll/ctocpp/download_handler_ctocpp.h', - 'libcef_dll/cpptoc/download_item_cpptoc.cc', - 'libcef_dll/cpptoc/download_item_cpptoc.h', - 'libcef_dll/cpptoc/download_item_callback_cpptoc.cc', - 'libcef_dll/cpptoc/download_item_callback_cpptoc.h', - 'libcef_dll/ctocpp/focus_handler_ctocpp.cc', - 'libcef_dll/ctocpp/focus_handler_ctocpp.h', - 'libcef_dll/cpptoc/frame_cpptoc.cc', - 'libcef_dll/cpptoc/frame_cpptoc.h', - 'libcef_dll/cpptoc/geolocation_callback_cpptoc.cc', - 'libcef_dll/cpptoc/geolocation_callback_cpptoc.h', - 'libcef_dll/ctocpp/geolocation_handler_ctocpp.cc', - 'libcef_dll/ctocpp/geolocation_handler_ctocpp.h', - 'libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc', - 'libcef_dll/cpptoc/jsdialog_callback_cpptoc.h', - 'libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc', - 'libcef_dll/ctocpp/jsdialog_handler_ctocpp.h', - 'libcef_dll/ctocpp/keyboard_handler_ctocpp.cc', - 'libcef_dll/ctocpp/keyboard_handler_ctocpp.h', - 'libcef_dll/ctocpp/life_span_handler_ctocpp.cc', - 'libcef_dll/ctocpp/life_span_handler_ctocpp.h', - 'libcef_dll/cpptoc/list_value_cpptoc.cc', - 'libcef_dll/cpptoc/list_value_cpptoc.h', - 'libcef_dll/ctocpp/load_handler_ctocpp.cc', - 'libcef_dll/ctocpp/load_handler_ctocpp.h', - 'libcef_dll/cpptoc/menu_model_cpptoc.cc', - 'libcef_dll/cpptoc/menu_model_cpptoc.h', - 'libcef_dll/cpptoc/post_data_cpptoc.cc', - 'libcef_dll/cpptoc/post_data_cpptoc.h', - 'libcef_dll/cpptoc/post_data_element_cpptoc.cc', - 'libcef_dll/cpptoc/post_data_element_cpptoc.h', - 'libcef_dll/cpptoc/process_message_cpptoc.cc', - 'libcef_dll/cpptoc/process_message_cpptoc.h', - 'libcef_dll/ctocpp/proxy_handler_ctocpp.cc', - 'libcef_dll/ctocpp/proxy_handler_ctocpp.h', - 'libcef_dll/ctocpp/read_handler_ctocpp.cc', - 'libcef_dll/ctocpp/read_handler_ctocpp.h', - 'libcef_dll/ctocpp/render_process_handler_ctocpp.cc', - 'libcef_dll/ctocpp/render_process_handler_ctocpp.h', - 'libcef_dll/cpptoc/request_cpptoc.cc', - 'libcef_dll/cpptoc/request_cpptoc.h', - 'libcef_dll/ctocpp/request_handler_ctocpp.cc', - 'libcef_dll/ctocpp/request_handler_ctocpp.h', - 'libcef_dll/ctocpp/resource_bundle_handler_ctocpp.cc', - 'libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h', - 'libcef_dll/ctocpp/resource_handler_ctocpp.cc', - 'libcef_dll/ctocpp/resource_handler_ctocpp.h', - 'libcef_dll/cpptoc/response_cpptoc.cc', - 'libcef_dll/cpptoc/response_cpptoc.h', - 'libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc', - 'libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h', - 'libcef_dll/cpptoc/scheme_registrar_cpptoc.cc', - 'libcef_dll/cpptoc/scheme_registrar_cpptoc.h', - 'libcef_dll/cpptoc/stream_reader_cpptoc.cc', - 'libcef_dll/cpptoc/stream_reader_cpptoc.h', - 'libcef_dll/cpptoc/stream_writer_cpptoc.cc', - 'libcef_dll/cpptoc/stream_writer_cpptoc.h', - 'libcef_dll/ctocpp/string_visitor_ctocpp.cc', - 'libcef_dll/ctocpp/string_visitor_ctocpp.h', - 'libcef_dll/ctocpp/task_ctocpp.cc', - 'libcef_dll/ctocpp/task_ctocpp.h', - 'libcef_dll/cpptoc/urlrequest_cpptoc.cc', - 'libcef_dll/cpptoc/urlrequest_cpptoc.h', - 'libcef_dll/ctocpp/urlrequest_client_ctocpp.cc', - 'libcef_dll/ctocpp/urlrequest_client_ctocpp.h', - 'libcef_dll/ctocpp/v8accessor_ctocpp.cc', - 'libcef_dll/ctocpp/v8accessor_ctocpp.h', - 'libcef_dll/cpptoc/v8context_cpptoc.cc', - 'libcef_dll/cpptoc/v8context_cpptoc.h', - 'libcef_dll/cpptoc/v8exception_cpptoc.cc', - 'libcef_dll/cpptoc/v8exception_cpptoc.h', - 'libcef_dll/ctocpp/v8handler_ctocpp.cc', - 'libcef_dll/ctocpp/v8handler_ctocpp.h', - 'libcef_dll/cpptoc/v8value_cpptoc.cc', - 'libcef_dll/cpptoc/v8value_cpptoc.h', - 'libcef_dll/cpptoc/web_plugin_info_cpptoc.cc', - 'libcef_dll/cpptoc/web_plugin_info_cpptoc.h', - 'libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.cc', - 'libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.h', - 'libcef_dll/ctocpp/write_handler_ctocpp.cc', - 'libcef_dll/ctocpp/write_handler_ctocpp.h', - 'libcef_dll/cpptoc/xml_reader_cpptoc.cc', - 'libcef_dll/cpptoc/xml_reader_cpptoc.h', - 'libcef_dll/cpptoc/zip_reader_cpptoc.cc', - 'libcef_dll/cpptoc/zip_reader_cpptoc.h', - ], - 'autogen_client_side': [ - 'libcef_dll/cpptoc/app_cpptoc.cc', - 'libcef_dll/cpptoc/app_cpptoc.h', - 'libcef_dll/ctocpp/auth_callback_ctocpp.cc', - 'libcef_dll/ctocpp/auth_callback_ctocpp.h', - 'libcef_dll/ctocpp/before_download_callback_ctocpp.cc', - 'libcef_dll/ctocpp/before_download_callback_ctocpp.h', - 'libcef_dll/ctocpp/binary_value_ctocpp.cc', - 'libcef_dll/ctocpp/binary_value_ctocpp.h', - 'libcef_dll/ctocpp/browser_ctocpp.cc', - 'libcef_dll/ctocpp/browser_ctocpp.h', - 'libcef_dll/ctocpp/browser_host_ctocpp.cc', - 'libcef_dll/ctocpp/browser_host_ctocpp.h', - 'libcef_dll/cpptoc/browser_process_handler_cpptoc.cc', - 'libcef_dll/cpptoc/browser_process_handler_cpptoc.h', - 'libcef_dll/ctocpp/callback_ctocpp.cc', - 'libcef_dll/ctocpp/callback_ctocpp.h', - 'libcef_dll/cpptoc/client_cpptoc.cc', - 'libcef_dll/cpptoc/client_cpptoc.h', - 'libcef_dll/ctocpp/command_line_ctocpp.cc', - 'libcef_dll/ctocpp/command_line_ctocpp.h', - 'libcef_dll/cpptoc/context_menu_handler_cpptoc.cc', - 'libcef_dll/cpptoc/context_menu_handler_cpptoc.h', - 'libcef_dll/ctocpp/context_menu_params_ctocpp.cc', - 'libcef_dll/ctocpp/context_menu_params_ctocpp.h', - 'libcef_dll/ctocpp/cookie_manager_ctocpp.cc', - 'libcef_dll/ctocpp/cookie_manager_ctocpp.h', - 'libcef_dll/cpptoc/cookie_visitor_cpptoc.cc', - 'libcef_dll/cpptoc/cookie_visitor_cpptoc.h', - 'libcef_dll/ctocpp/domdocument_ctocpp.cc', - 'libcef_dll/ctocpp/domdocument_ctocpp.h', - 'libcef_dll/ctocpp/domevent_ctocpp.cc', - 'libcef_dll/ctocpp/domevent_ctocpp.h', - 'libcef_dll/cpptoc/domevent_listener_cpptoc.cc', - 'libcef_dll/cpptoc/domevent_listener_cpptoc.h', - 'libcef_dll/ctocpp/domnode_ctocpp.cc', - 'libcef_dll/ctocpp/domnode_ctocpp.h', - 'libcef_dll/cpptoc/domvisitor_cpptoc.cc', - 'libcef_dll/cpptoc/domvisitor_cpptoc.h', - 'libcef_dll/ctocpp/dictionary_value_ctocpp.cc', - 'libcef_dll/ctocpp/dictionary_value_ctocpp.h', - 'libcef_dll/cpptoc/display_handler_cpptoc.cc', - 'libcef_dll/cpptoc/display_handler_cpptoc.h', - 'libcef_dll/cpptoc/download_handler_cpptoc.cc', - 'libcef_dll/cpptoc/download_handler_cpptoc.h', - 'libcef_dll/ctocpp/download_item_ctocpp.cc', - 'libcef_dll/ctocpp/download_item_ctocpp.h', - 'libcef_dll/ctocpp/download_item_callback_ctocpp.cc', - 'libcef_dll/ctocpp/download_item_callback_ctocpp.h', - 'libcef_dll/cpptoc/focus_handler_cpptoc.cc', - 'libcef_dll/cpptoc/focus_handler_cpptoc.h', - 'libcef_dll/ctocpp/frame_ctocpp.cc', - 'libcef_dll/ctocpp/frame_ctocpp.h', - 'libcef_dll/ctocpp/geolocation_callback_ctocpp.cc', - 'libcef_dll/ctocpp/geolocation_callback_ctocpp.h', - 'libcef_dll/cpptoc/geolocation_handler_cpptoc.cc', - 'libcef_dll/cpptoc/geolocation_handler_cpptoc.h', - 'libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc', - 'libcef_dll/ctocpp/jsdialog_callback_ctocpp.h', - 'libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc', - 'libcef_dll/cpptoc/jsdialog_handler_cpptoc.h', - 'libcef_dll/cpptoc/keyboard_handler_cpptoc.cc', - 'libcef_dll/cpptoc/keyboard_handler_cpptoc.h', - 'libcef_dll/cpptoc/life_span_handler_cpptoc.cc', - 'libcef_dll/cpptoc/life_span_handler_cpptoc.h', - 'libcef_dll/ctocpp/list_value_ctocpp.cc', - 'libcef_dll/ctocpp/list_value_ctocpp.h', - 'libcef_dll/cpptoc/load_handler_cpptoc.cc', - 'libcef_dll/cpptoc/load_handler_cpptoc.h', - 'libcef_dll/ctocpp/menu_model_ctocpp.cc', - 'libcef_dll/ctocpp/menu_model_ctocpp.h', - 'libcef_dll/ctocpp/post_data_ctocpp.cc', - 'libcef_dll/ctocpp/post_data_ctocpp.h', - 'libcef_dll/ctocpp/post_data_element_ctocpp.cc', - 'libcef_dll/ctocpp/post_data_element_ctocpp.h', - 'libcef_dll/ctocpp/process_message_ctocpp.cc', - 'libcef_dll/ctocpp/process_message_ctocpp.h', - 'libcef_dll/cpptoc/proxy_handler_cpptoc.cc', - 'libcef_dll/cpptoc/proxy_handler_cpptoc.h', - 'libcef_dll/cpptoc/read_handler_cpptoc.cc', - 'libcef_dll/cpptoc/read_handler_cpptoc.h', - 'libcef_dll/cpptoc/render_process_handler_cpptoc.cc', - 'libcef_dll/cpptoc/render_process_handler_cpptoc.h', - 'libcef_dll/ctocpp/request_ctocpp.cc', - 'libcef_dll/ctocpp/request_ctocpp.h', - 'libcef_dll/cpptoc/request_handler_cpptoc.cc', - 'libcef_dll/cpptoc/request_handler_cpptoc.h', - 'libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc', - 'libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h', - 'libcef_dll/cpptoc/resource_handler_cpptoc.cc', - 'libcef_dll/cpptoc/resource_handler_cpptoc.h', - 'libcef_dll/ctocpp/response_ctocpp.cc', - 'libcef_dll/ctocpp/response_ctocpp.h', - 'libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc', - 'libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h', - 'libcef_dll/ctocpp/scheme_registrar_ctocpp.cc', - 'libcef_dll/ctocpp/scheme_registrar_ctocpp.h', - 'libcef_dll/ctocpp/stream_reader_ctocpp.cc', - 'libcef_dll/ctocpp/stream_reader_ctocpp.h', - 'libcef_dll/ctocpp/stream_writer_ctocpp.cc', - 'libcef_dll/ctocpp/stream_writer_ctocpp.h', - 'libcef_dll/cpptoc/string_visitor_cpptoc.cc', - 'libcef_dll/cpptoc/string_visitor_cpptoc.h', - 'libcef_dll/cpptoc/task_cpptoc.cc', - 'libcef_dll/cpptoc/task_cpptoc.h', - 'libcef_dll/ctocpp/urlrequest_ctocpp.cc', - 'libcef_dll/ctocpp/urlrequest_ctocpp.h', - 'libcef_dll/cpptoc/urlrequest_client_cpptoc.cc', - 'libcef_dll/cpptoc/urlrequest_client_cpptoc.h', - 'libcef_dll/cpptoc/v8accessor_cpptoc.cc', - 'libcef_dll/cpptoc/v8accessor_cpptoc.h', - 'libcef_dll/ctocpp/v8context_ctocpp.cc', - 'libcef_dll/ctocpp/v8context_ctocpp.h', - 'libcef_dll/ctocpp/v8exception_ctocpp.cc', - 'libcef_dll/ctocpp/v8exception_ctocpp.h', - 'libcef_dll/cpptoc/v8handler_cpptoc.cc', - 'libcef_dll/cpptoc/v8handler_cpptoc.h', - 'libcef_dll/ctocpp/v8value_ctocpp.cc', - 'libcef_dll/ctocpp/v8value_ctocpp.h', - 'libcef_dll/ctocpp/web_plugin_info_ctocpp.cc', - 'libcef_dll/ctocpp/web_plugin_info_ctocpp.h', - 'libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc', - 'libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h', - 'libcef_dll/cpptoc/write_handler_cpptoc.cc', - 'libcef_dll/cpptoc/write_handler_cpptoc.h', - 'libcef_dll/ctocpp/xml_reader_ctocpp.cc', - 'libcef_dll/ctocpp/xml_reader_ctocpp.h', - 'libcef_dll/ctocpp/zip_reader_ctocpp.cc', - 'libcef_dll/ctocpp/zip_reader_ctocpp.h', - ], - }, -} diff --git a/cef/frameworks/cef_paths2.gypi b/cef/frameworks/cef_paths2.gypi deleted file mode 100644 index a6fe2ba65..000000000 --- a/cef/frameworks/cef_paths2.gypi +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights -# reserved. Use of this source code is governed by a BSD-style license that -# can be found in the LICENSE file. - -{ - 'includes': [ - # Bring in the autogenerated source file lists. - 'cef_paths.gypi', - ], - 'variables': { - 'includes_common': [ - 'include/cef_base.h', - 'include/cef_pack_resources.h', - 'include/cef_pack_strings.h', - 'include/cef_runnable.h', - 'include/cef_version.h', - 'include/internal/cef_build.h', - 'include/internal/cef_export.h', - 'include/internal/cef_ptr.h', - 'include/internal/cef_string.h', - 'include/internal/cef_string_list.h', - 'include/internal/cef_string_map.h', - 'include/internal/cef_string_multimap.h', - 'include/internal/cef_string_types.h', - 'include/internal/cef_string_wrappers.h', - 'include/internal/cef_time.h', - 'include/internal/cef_tuple.h', - 'include/internal/cef_types.h', - 'include/internal/cef_types_wrappers.h', - '<@(autogen_cpp_includes)', - ], - 'includes_capi': [ - 'include/capi/cef_base_capi.h', - '<@(autogen_capi_includes)', - ], - 'includes_wrapper': [ - 'include/wrapper/cef_byte_read_handler.h', - 'include/wrapper/cef_stream_resource_handler.h', - 'include/wrapper/cef_xml_object.h', - 'include/wrapper/cef_zip_archive.h', - ], - 'includes_win': [ - 'include/internal/cef_types_win.h', - 'include/internal/cef_win.h', - ], - 'includes_mac': [ - 'include/cef_application_mac.h', - 'include/internal/cef_mac.h', - 'include/internal/cef_types_mac.h', - ], - 'includes_linux': [ - 'include/internal/cef_linux.h', - 'include/internal/cef_types_linux.h', - ], - 'libcef_sources_common': [ - 'libcef_dll/cef_logging.h', - 'libcef_dll/cpptoc/cpptoc.h', - 'libcef_dll/ctocpp/ctocpp.h', - 'libcef_dll/libcef_dll.cc', - 'libcef_dll/libcef_dll2.cc', - 'libcef_dll/resource.h', - 'libcef_dll/transfer_util.cpp', - 'libcef_dll/transfer_util.h', - '<@(autogen_library_side)', - ], - 'libcef_dll_wrapper_sources_common': [ - 'libcef_dll/cef_logging.h', - 'libcef_dll/cpptoc/base_cpptoc.h', - 'libcef_dll/cpptoc/cpptoc.h', - 'libcef_dll/ctocpp/base_ctocpp.h', - 'libcef_dll/ctocpp/ctocpp.h', - 'libcef_dll/transfer_util.cpp', - 'libcef_dll/transfer_util.h', - 'libcef_dll/wrapper/cef_byte_read_handler.cc', - 'libcef_dll/wrapper/cef_stream_resource_handler.cc', - 'libcef_dll/wrapper/cef_xml_object.cc', - 'libcef_dll/wrapper/cef_zip_archive.cc', - 'libcef_dll/wrapper/libcef_dll_wrapper.cc', - 'libcef_dll/wrapper/libcef_dll_wrapper2.cc', - '<@(autogen_client_side)', - ], - 'cefclient_sources_common': [ - 'tests/cefclient/cefclient.cpp', - 'tests/cefclient/cefclient.h', - 'tests/cefclient/binding_test.cpp', - 'tests/cefclient/binding_test.h', - 'tests/cefclient/client_app.cpp', - 'tests/cefclient/client_app.h', - 'tests/cefclient/client_app_delegates.cpp', - 'tests/cefclient/client_handler.cpp', - 'tests/cefclient/client_handler.h', - 'tests/cefclient/client_renderer.cpp', - 'tests/cefclient/client_renderer.h', - 'tests/cefclient/client_switches.cpp', - 'tests/cefclient/client_switches.h', - 'tests/cefclient/dom_test.cpp', - 'tests/cefclient/dom_test.h', - 'tests/cefclient/res/binding.html', - 'tests/cefclient/res/dialogs.html', - 'tests/cefclient/res/domaccess.html', - 'tests/cefclient/res/localstorage.html', - 'tests/cefclient/res/logo.png', - 'tests/cefclient/res/xmlhttprequest.html', - 'tests/cefclient/resource_util.h', - 'tests/cefclient/scheme_test.cpp', - 'tests/cefclient/scheme_test.h', - 'tests/cefclient/string_util.cpp', - 'tests/cefclient/string_util.h', - 'tests/cefclient/util.h', - ], - 'cefclient_sources_win': [ - 'tests/cefclient/cefclient.rc', - 'tests/cefclient/cefclient_win.cpp', - 'tests/cefclient/client_handler_win.cpp', - 'tests/cefclient/resource.h', - 'tests/cefclient/res/cefclient.ico', - 'tests/cefclient/res/logoball.png', - 'tests/cefclient/res/small.ico', - 'tests/cefclient/resource_util_win.cpp', - ], - 'cefclient_sources_mac': [ - 'tests/cefclient/cefclient_mac.mm', - 'tests/cefclient/client_handler_mac.mm', - 'tests/cefclient/resource_util_mac.mm', - ], - 'cefclient_sources_mac_helper': [ - 'tests/cefclient/binding_test.cpp', - 'tests/cefclient/binding_test.h', - 'tests/cefclient/client_app.cpp', - 'tests/cefclient/client_app.h', - 'tests/cefclient/client_app_delegates.cpp', - 'tests/cefclient/client_handler.cpp', - 'tests/cefclient/client_handler.h', - 'tests/cefclient/client_handler_mac.mm', - 'tests/cefclient/client_renderer.cpp', - 'tests/cefclient/client_renderer.h', - 'tests/cefclient/client_switches.cpp', - 'tests/cefclient/client_switches.h', - 'tests/cefclient/dom_test.cpp', - 'tests/cefclient/dom_test.h', - 'tests/cefclient/process_helper_mac.cpp', - 'tests/cefclient/resource_util.h', - 'tests/cefclient/resource_util_mac.mm', - 'tests/cefclient/scheme_test.cpp', - 'tests/cefclient/scheme_test.h', - 'tests/cefclient/string_util.cpp', - 'tests/cefclient/string_util.h', - 'tests/cefclient/util.h', - ], - 'cefclient_bundle_resources_mac': [ - 'tests/cefclient/mac/cefclient.icns', - 'tests/cefclient/mac/English.lproj/InfoPlist.strings', - 'tests/cefclient/mac/English.lproj/MainMenu.xib', - 'tests/cefclient/mac/Info.plist', - 'tests/cefclient/res/binding.html', - 'tests/cefclient/res/dialogs.html', - 'tests/cefclient/res/domaccess.html', - 'tests/cefclient/res/localstorage.html', - 'tests/cefclient/res/logo.png', - 'tests/cefclient/res/xmlhttprequest.html', - ], - 'cefclient_sources_linux': [ - 'tests/cefclient/cefclient_gtk.cpp', - 'tests/cefclient/client_handler_gtk.cpp', - 'tests/cefclient/resource_util_linux.cpp', - ], - 'cefclient_bundle_resources_linux': [ - 'tests/cefclient/res/binding.html', - 'tests/cefclient/res/domaccess.html', - 'tests/cefclient/res/localstorage.html', - 'tests/cefclient/res/logo.png', - 'tests/cefclient/res/xmlhttprequest.html', - ], - }, -} diff --git a/cef/frameworks/ffmpegsumo.so b/cef/frameworks/ffmpegsumo.so index d8f5826d5..99f1988d4 100755 Binary files a/cef/frameworks/ffmpegsumo.so and b/cef/frameworks/ffmpegsumo.so differ diff --git a/cef/frameworks/libcef.dylib b/cef/frameworks/libcef.dylib index c63ed444c..9c2f6873f 100755 Binary files a/cef/frameworks/libcef.dylib and b/cef/frameworks/libcef.dylib differ diff --git a/cef/frameworks/libcef.dylib.dSYM/Contents/Info.plist b/cef/frameworks/libcef.dylib.dSYM/Contents/Info.plist deleted file mode 100644 index 512ed0b2c..000000000 --- a/cef/frameworks/libcef.dylib.dSYM/Contents/Info.plist +++ /dev/null @@ -1,27 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleIdentifier - com.apple.xcode.dsym.libcef.dylib - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - dSYM - CFBundleSignature - ???? - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - dSYM_UUID - - i386 - B1738709-A4C5-3D9B-BE79-A8FF138FC819 - - fake_dsym - - - diff --git a/cef/frameworks/libcef.dylib.dSYM/Contents/Resources/DWARF/libcef.dylib b/cef/frameworks/libcef.dylib.dSYM/Contents/Resources/DWARF/libcef.dylib deleted file mode 100644 index 00aa792a2..000000000 Binary files a/cef/frameworks/libcef.dylib.dSYM/Contents/Resources/DWARF/libcef.dylib and /dev/null differ diff --git a/cef/include/capi/cef_browser_capi.h b/cef/include/capi/cef_browser_capi.h index 10ba46f24..79c832494 100644 --- a/cef/include/capi/cef_browser_capi.h +++ b/cef/include/capi/cef_browser_capi.h @@ -114,7 +114,9 @@ typedef struct _cef_browser_t { /// int (CEF_CALLBACK *is_popup)(struct _cef_browser_t* self); + /// // Returns true (1) if a document has been loaded in the browser. + /// int (CEF_CALLBACK *has_document)(struct _cef_browser_t* self); /// @@ -238,12 +240,15 @@ typedef struct _cef_browser_host_t { struct _cef_browser_host_t* self, int http_scheme); /// - // Get the zoom level. This function can only be called on the UI thread. + // Get the current zoom level. The default zoom level is 0.0. This function + // can only be called on the UI thread. /// double (CEF_CALLBACK *get_zoom_level)(struct _cef_browser_host_t* self); /// - // Change the zoom level to the specified value. + // Change the zoom level to the specified value. Specify 0.0 to reset the zoom + // level. If called on the UI thread the change will be applied immediately. + // Otherwise, the change will be applied asynchronously on the UI thread. /// void (CEF_CALLBACK *set_zoom_level)(struct _cef_browser_host_t* self, double zoomLevel); diff --git a/cef/include/capi/cef_command_line_capi.h b/cef/include/capi/cef_command_line_capi.h index 49a883899..406a2eb04 100644 --- a/cef/include/capi/cef_command_line_capi.h +++ b/cef/include/capi/cef_command_line_capi.h @@ -100,6 +100,13 @@ typedef struct _cef_command_line_t { /// void (CEF_CALLBACK *reset)(struct _cef_command_line_t* self); + /// + // Retrieve the original command line string as a vector of strings. The argv + // array: { program, [(--|-|/)switch[=value]]*, [--], [argument]* } + /// + void (CEF_CALLBACK *get_argv)(struct _cef_command_line_t* self, + cef_string_list_t argv); + /// // Constructs and returns the represented command line string. Use this // function cautiously because quoting behavior is unclear. diff --git a/cef/include/capi/cef_display_handler_capi.h b/cef/include/capi/cef_display_handler_capi.h index 6c4ad694b..f2b68017a 100644 --- a/cef/include/capi/cef_display_handler_capi.h +++ b/cef/include/capi/cef_display_handler_capi.h @@ -91,8 +91,7 @@ typedef struct _cef_display_handler_t { // status message type. /// void (CEF_CALLBACK *on_status_message)(struct _cef_display_handler_t* self, - struct _cef_browser_t* browser, const cef_string_t* value, - enum cef_handler_statustype_t type); + struct _cef_browser_t* browser, const cef_string_t* value); /// // Called to display a console message. Return true (1) to stop the message diff --git a/cef/include/capi/cef_v8_capi.h b/cef/include/capi/cef_v8_capi.h index 6acc03726..03dc58661 100644 --- a/cef/include/capi/cef_v8_capi.h +++ b/cef/include/capi/cef_v8_capi.h @@ -700,6 +700,92 @@ CEF_EXPORT cef_v8value_t* cef_v8value_create_function(const cef_string_t* name, cef_v8handler_t* handler); +/// +// Structure representing a V8 stack trace. The functions of this structure may +// only be called on the render process main thread. +/// +typedef struct _cef_v8stack_trace_t { + /// + // Base structure. + /// + cef_base_t base; + + /// + // Returns the number of stack frames. + /// + int (CEF_CALLBACK *get_frame_count)(struct _cef_v8stack_trace_t* self); + + /// + // Returns the stack frame at the specified 0-based index. + /// + struct _cef_v8stack_frame_t* (CEF_CALLBACK *get_frame)( + struct _cef_v8stack_trace_t* self, int index); +} cef_v8stack_trace_t; + + +/// +// Returns the stack trace for the currently active context. |frame_limit| is +// the maximum number of frames that will be captured. +/// +CEF_EXPORT cef_v8stack_trace_t* cef_v8stack_trace_get_current(int frame_limit); + + +/// +// Structure representing a V8 stack frame. The functions of this structure may +// only be called on the render process main thread. +/// +typedef struct _cef_v8stack_frame_t { + /// + // Base structure. + /// + cef_base_t base; + + /// + // Returns the name of the resource script that contains the function. + /// + // The resulting string must be freed by calling cef_string_userfree_free(). + cef_string_userfree_t (CEF_CALLBACK *get_script_name)( + struct _cef_v8stack_frame_t* self); + + /// + // Returns the name of the resource script that contains the function or the + // sourceURL value if the script name is undefined and its source ends with a + // "//@ sourceURL=..." string. + /// + // The resulting string must be freed by calling cef_string_userfree_free(). + cef_string_userfree_t (CEF_CALLBACK *get_script_name_or_source_url)( + struct _cef_v8stack_frame_t* self); + + /// + // Returns the name of the function. + /// + // The resulting string must be freed by calling cef_string_userfree_free(). + cef_string_userfree_t (CEF_CALLBACK *get_function_name)( + struct _cef_v8stack_frame_t* self); + + /// + // Returns the 1-based line number for the function call or 0 if unknown. + /// + int (CEF_CALLBACK *get_line_number)(struct _cef_v8stack_frame_t* self); + + /// + // Returns the 1-based column offset on the line for the function call or 0 if + // unknown. + /// + int (CEF_CALLBACK *get_column)(struct _cef_v8stack_frame_t* self); + + /// + // Returns true (1) if the function was compiled using eval(). + /// + int (CEF_CALLBACK *is_eval)(struct _cef_v8stack_frame_t* self); + + /// + // Returns true (1) if the function was called as a constructor via "new". + /// + int (CEF_CALLBACK *is_constructor)(struct _cef_v8stack_frame_t* self); +} cef_v8stack_frame_t; + + #ifdef __cplusplus } #endif diff --git a/cef/include/cef_browser.h b/cef/include/cef_browser.h index b54f7dda3..512ed24e1 100644 --- a/cef/include/cef_browser.h +++ b/cef/include/cef_browser.h @@ -273,13 +273,17 @@ class CefBrowserHost : public virtual CefBase { virtual CefString GetDevToolsURL(bool http_scheme) =0; /// - // Get the zoom level. This method can only be called on the UI thread. + // Get the current zoom level. The default zoom level is 0.0. This method can + // only be called on the UI thread. /// /*--cef()--*/ virtual double GetZoomLevel() =0; /// - // Change the zoom level to the specified value. + // Change the zoom level to the specified value. Specify 0.0 to reset the + // zoom level. If called on the UI thread the change will be applied + // immediately. Otherwise, the change will be applied asynchronously on the + // UI thread. /// /*--cef()--*/ virtual void SetZoomLevel(double zoomLevel) =0; diff --git a/cef/include/cef_command_line.h b/cef/include/cef_command_line.h index 38f1a434d..7b5343f47 100644 --- a/cef/include/cef_command_line.h +++ b/cef/include/cef_command_line.h @@ -113,6 +113,13 @@ class CefCommandLine : public virtual CefBase { /*--cef()--*/ virtual void Reset() =0; + /// + // Retrieve the original command line string as a vector of strings. + // The argv array: { program, [(--|-|/)switch[=value]]*, [--], [argument]* } + /// + /*--cef()--*/ + virtual void GetArgv(std::vector& argv) =0; + /// // Constructs and returns the represented command line string. Use this method // cautiously because quoting behavior is unclear. diff --git a/cef/include/cef_display_handler.h b/cef/include/cef_display_handler.h index 7a1c270d4..f54a650ea 100644 --- a/cef/include/cef_display_handler.h +++ b/cef/include/cef_display_handler.h @@ -49,8 +49,6 @@ /*--cef(source=client)--*/ class CefDisplayHandler : public virtual CefBase { public: - typedef cef_handler_statustype_t StatusType; - /// // Called when the loading state has changed. /// @@ -92,8 +90,7 @@ class CefDisplayHandler : public virtual CefBase { /// /*--cef(optional_param=value)--*/ virtual void OnStatusMessage(CefRefPtr browser, - const CefString& value, - StatusType type) {} + const CefString& value) {} /// // Called to display a console message. Return true to stop the message from diff --git a/cef/include/cef_pack_resources.h b/cef/include/cef_pack_resources.h index 1526ebf12..c4d4f1630 100644 --- a/cef/include/cef_pack_resources.h +++ b/cef/include/cef_pack_resources.h @@ -39,199 +39,200 @@ // --------------------------------------------------------------------------- // From cef_resources.h: -#define IDR_CEF_DEVTOOLS_DISCOVERY_PAGE 26000 +#define IDR_CEF_DEVTOOLS_DISCOVERY_PAGE 27500 // --------------------------------------------------------------------------- // From content_resources.h: -#define IDR_DOM_AUTOMATION_JS 24500 -#define IDR_GPU_SANDBOX_PROFILE 24501 -#define IDR_WORKER_SANDBOX_PROFILE 24502 -#define IDR_COMMON_SANDBOX_PROFILE 24503 -#define IDR_PPAPI_SANDBOX_PROFILE 24504 -#define IDR_RENDERER_SANDBOX_PROFILE 24505 -#define IDR_UTILITY_SANDBOX_PROFILE 24506 +#define IDR_DOM_AUTOMATION_JS 25000 +#define IDR_GPU_SANDBOX_PROFILE 25001 +#define IDR_WORKER_SANDBOX_PROFILE 25002 +#define IDR_COMMON_SANDBOX_PROFILE 25003 +#define IDR_PPAPI_SANDBOX_PROFILE 25004 +#define IDR_RENDERER_SANDBOX_PROFILE 25005 +#define IDR_UTILITY_SANDBOX_PROFILE 25006 // --------------------------------------------------------------------------- // From devtools_resources.h: -#define DEVTOOLS_HTML 20500 -#define DEVTOOLS_JS 20501 -#define HEAPSNAPSHOTWORKER_JS 20502 -#define SCRIPTFORMATTERWORKER_JS 20503 -#define DEVTOOLS_CSS 20504 -#define DEVTOOLS_EXTENSION_API_JS 20505 -#define AUDITSPANEL_CSS 20506 -#define DATAGRID_CSS 20507 -#define ELEMENTSPANEL_CSS 20508 -#define FILTEREDITEMSELECTIONDIALOG_CSS 20509 -#define HEAPPROFILER_CSS 20510 -#define HELPSCREEN_CSS 20511 -#define INDEXEDDBVIEWS_CSS 20512 -#define INSPECTORCOMMON_CSS 20513 -#define NATIVEMEMORYPROFILER_CSS 20514 -#define NAVIGATORVIEW_CSS 20515 -#define NETWORKLOGVIEW_CSS 20516 -#define NETWORKPANEL_CSS 20517 -#define PANELENABLERVIEW_CSS 20518 -#define PROFILESPANEL_CSS 20519 -#define RESOURCEVIEW_CSS 20520 -#define RESOURCESPANEL_CSS 20521 -#define REVISIONHISTORY_CSS 20522 -#define SCRIPTSPANEL_CSS 20523 -#define SPLITVIEW_CSS 20524 -#define TABBEDPANE_CSS 20525 -#define TEXTPROMPT_CSS 20526 -#define TEXTVIEWER_CSS 20527 -#define TIMELINEPANEL_CSS 20528 -#define IMAGES_APPLICATIONCACHE_PNG 20529 -#define IMAGES_BACK_PNG 20530 -#define IMAGES_BREAKPOINTBORDER_PNG 20531 -#define IMAGES_BREAKPOINTCONDITIONALBORDER_PNG 20532 -#define IMAGES_BREAKPOINTCONDITIONALCOUNTERBORDER_PNG 20533 -#define IMAGES_BREAKPOINTCOUNTERBORDER_PNG 20534 -#define IMAGES_CHECKER_PNG 20535 -#define IMAGES_CLOSEBUTTONS_PNG 20536 -#define IMAGES_COOKIE_PNG 20537 -#define IMAGES_DATABASE_PNG 20538 -#define IMAGES_DATABASETABLE_PNG 20539 -#define IMAGES_DEBUGGERCONTINUE_PNG 20540 -#define IMAGES_DEBUGGERPAUSE_PNG 20541 -#define IMAGES_DEBUGGERSTEPINTO_PNG 20542 -#define IMAGES_DEBUGGERSTEPOUT_PNG 20543 -#define IMAGES_DEBUGGERSTEPOVER_PNG 20544 -#define IMAGES_DELETEICON_PNG 20545 -#define IMAGES_DISCLOSURETRIANGLESMALLDOWN_PNG 20546 -#define IMAGES_DISCLOSURETRIANGLESMALLDOWNBLACK_PNG 20547 -#define IMAGES_DISCLOSURETRIANGLESMALLDOWNWHITE_PNG 20548 -#define IMAGES_DISCLOSURETRIANGLESMALLRIGHT_PNG 20549 -#define IMAGES_DISCLOSURETRIANGLESMALLRIGHTBLACK_PNG 20550 -#define IMAGES_DISCLOSURETRIANGLESMALLRIGHTDOWN_PNG 20551 -#define IMAGES_DISCLOSURETRIANGLESMALLRIGHTDOWNBLACK_PNG 20552 -#define IMAGES_DISCLOSURETRIANGLESMALLRIGHTDOWNWHITE_PNG 20553 -#define IMAGES_DISCLOSURETRIANGLESMALLRIGHTWHITE_PNG 20554 -#define IMAGES_DOMAIN_PNG 20555 -#define IMAGES_ERRORICON_PNG 20556 -#define IMAGES_ERRORMEDIUMICON_PNG 20557 -#define IMAGES_ERRORREDDOT_PNG 20558 -#define IMAGES_FILESYSTEM_PNG 20559 -#define IMAGES_FORWARD_PNG 20560 -#define IMAGES_FRAME_PNG 20561 -#define IMAGES_GLOSSYHEADER_PNG 20562 -#define IMAGES_GLOSSYHEADERPRESSED_PNG 20563 -#define IMAGES_GLOSSYHEADERSELECTED_PNG 20564 -#define IMAGES_GLOSSYHEADERSELECTEDPRESSED_PNG 20565 -#define IMAGES_GOARROW_PNG 20566 -#define IMAGES_GRAPHLABELCALLOUTLEFT_PNG 20567 -#define IMAGES_GRAPHLABELCALLOUTRIGHT_PNG 20568 -#define IMAGES_INDEXEDDB_PNG 20569 -#define IMAGES_INDEXEDDBINDEX_PNG 20570 -#define IMAGES_INDEXEDDBOBJECTSTORE_PNG 20571 -#define IMAGES_LOCALSTORAGE_PNG 20572 -#define IMAGES_NAVIGATORSHOWHIDEBUTTON_PNG 20573 -#define IMAGES_PANEADDBUTTONS_PNG 20574 -#define IMAGES_PANEBOTTOMGROW_PNG 20575 -#define IMAGES_PANEBOTTOMGROWACTIVE_PNG 20576 -#define IMAGES_PANEELEMENTSTATEBUTTONS_PNG 20577 -#define IMAGES_PANEFILTERBUTTONS_PNG 20578 -#define IMAGES_PANEGROWHANDLELINE_PNG 20579 -#define IMAGES_PANEREFRESHBUTTONS_PNG 20580 -#define IMAGES_PANESETTINGSBUTTONS_PNG 20581 -#define IMAGES_POPOVERARROWS_PNG 20582 -#define IMAGES_POPOVERBACKGROUND_PNG 20583 -#define IMAGES_PROFILEGROUPICON_PNG 20584 -#define IMAGES_PROFILEICON_PNG 20585 -#define IMAGES_PROFILESMALLICON_PNG 20586 -#define IMAGES_PROFILESSILHOUETTE_PNG 20587 -#define IMAGES_PROGRAMCOUNTERBORDER_PNG 20588 -#define IMAGES_RADIODOT_PNG 20589 -#define IMAGES_RESOURCECSSICON_PNG 20590 -#define IMAGES_RESOURCEDOCUMENTICON_PNG 20591 -#define IMAGES_RESOURCEDOCUMENTICONSMALL_PNG 20592 -#define IMAGES_RESOURCEJSICON_PNG 20593 -#define IMAGES_RESOURCEPLAINICON_PNG 20594 -#define IMAGES_RESOURCEPLAINICONSMALL_PNG 20595 -#define IMAGES_RESOURCESSIZEGRAPHICON_PNG 20596 -#define IMAGES_RESOURCESTIMEGRAPHICON_PNG 20597 -#define IMAGES_SCRIPTSSILHOUETTE_PNG 20598 -#define IMAGES_SEARCHNEXT_PNG 20599 -#define IMAGES_SEARCHPREV_PNG 20600 -#define IMAGES_SEARCHSMALLBLUE_PNG 20601 -#define IMAGES_SEARCHSMALLBRIGHTBLUE_PNG 20602 -#define IMAGES_SEARCHSMALLGRAY_PNG 20603 -#define IMAGES_SEARCHSMALLWHITE_PNG 20604 -#define IMAGES_SEGMENT_PNG 20605 -#define IMAGES_SEGMENTEND_PNG 20606 -#define IMAGES_SEGMENTHOVER_PNG 20607 -#define IMAGES_SEGMENTHOVEREND_PNG 20608 -#define IMAGES_SEGMENTSELECTED_PNG 20609 -#define IMAGES_SEGMENTSELECTEDEND_PNG 20610 -#define IMAGES_SESSIONSTORAGE_PNG 20611 -#define IMAGES_SPINNER_GIF 20612 -#define IMAGES_SPINNERACTIVE_GIF 20613 -#define IMAGES_SPINNERACTIVESELECTED_GIF 20614 -#define IMAGES_SPINNERINACTIVE_GIF 20615 -#define IMAGES_SPINNERINACTIVESELECTED_GIF 20616 -#define IMAGES_SPLITVIEWDIMPLE_PNG 20617 -#define IMAGES_SPLITVIEWDIVIDERBACKGROUND_PNG 20618 -#define IMAGES_STATUSBARBACKGROUND_PNG 20619 -#define IMAGES_STATUSBARBOTTOMBACKGROUND_PNG 20620 -#define IMAGES_STATUSBARBUTTONGLYPHS_PNG 20621 -#define IMAGES_STATUSBARBUTTONS_PNG 20622 -#define IMAGES_STATUSBARMENUBUTTON_PNG 20623 -#define IMAGES_STATUSBARMENUBUTTONSELECTED_PNG 20624 -#define IMAGES_STATUSBARRESIZERHORIZONTAL_PNG 20625 -#define IMAGES_STATUSBARRESIZERVERTICAL_PNG 20626 -#define IMAGES_SUCCESSGREENDOT_PNG 20627 -#define IMAGES_THUMBACTIVEHORIZ_PNG 20628 -#define IMAGES_THUMBACTIVEVERT_PNG 20629 -#define IMAGES_THUMBHORIZ_PNG 20630 -#define IMAGES_THUMBHOVERHORIZ_PNG 20631 -#define IMAGES_THUMBHOVERVERT_PNG 20632 -#define IMAGES_THUMBVERT_PNG 20633 -#define IMAGES_TICKMARK_PNG 20634 -#define IMAGES_TIMELINEHOLLOWPILLBLUE_PNG 20635 -#define IMAGES_TIMELINEHOLLOWPILLGRAY_PNG 20636 -#define IMAGES_TIMELINEHOLLOWPILLGREEN_PNG 20637 -#define IMAGES_TIMELINEHOLLOWPILLORANGE_PNG 20638 -#define IMAGES_TIMELINEHOLLOWPILLPURPLE_PNG 20639 -#define IMAGES_TIMELINEHOLLOWPILLRED_PNG 20640 -#define IMAGES_TIMELINEHOLLOWPILLYELLOW_PNG 20641 -#define IMAGES_TIMELINEPILLBLUE_PNG 20642 -#define IMAGES_TIMELINEPILLGRAY_PNG 20643 -#define IMAGES_TIMELINEPILLGREEN_PNG 20644 -#define IMAGES_TIMELINEPILLORANGE_PNG 20645 -#define IMAGES_TIMELINEPILLPURPLE_PNG 20646 -#define IMAGES_TIMELINEPILLRED_PNG 20647 -#define IMAGES_TIMELINEPILLYELLOW_PNG 20648 -#define IMAGES_TOOLBARICONS_PNG 20649 -#define IMAGES_TOOLBARICONSSMALL_PNG 20650 -#define IMAGES_TOOLBARITEMSELECTED_PNG 20651 -#define IMAGES_TRACKHORIZ_PNG 20652 -#define IMAGES_TRACKVERT_PNG 20653 -#define IMAGES_TREEDOWNTRIANGLEBLACK_PNG 20654 -#define IMAGES_TREEDOWNTRIANGLEWHITE_PNG 20655 -#define IMAGES_TREERIGHTTRIANGLEBLACK_PNG 20656 -#define IMAGES_TREERIGHTTRIANGLEWHITE_PNG 20657 -#define IMAGES_TREEUPTRIANGLEBLACK_PNG 20658 -#define IMAGES_TREEUPTRIANGLEWHITE_PNG 20659 -#define IMAGES_USERINPUTICON_PNG 20660 -#define IMAGES_USERINPUTPREVIOUSICON_PNG 20661 -#define IMAGES_USERINPUTRESULTICON_PNG 20662 -#define IMAGES_WARNINGICON_PNG 20663 -#define IMAGES_WARNINGMEDIUMICON_PNG 20664 -#define IMAGES_WARNINGORANGEDOT_PNG 20665 -#define IMAGES_WARNINGSERRORS_PNG 20666 -#define IMAGES_SEGMENTCHROMIUM_PNG 20667 -#define IMAGES_SEGMENTHOVERCHROMIUM_PNG 20668 -#define IMAGES_SEGMENTHOVERENDCHROMIUM_PNG 20669 -#define IMAGES_SEGMENTSELECTEDCHROMIUM_PNG 20670 -#define IMAGES_SEGMENTSELECTEDENDCHROMIUM_PNG 20671 -#define IMAGES_STATUSBARBACKGROUNDCHROMIUM_PNG 20672 -#define IMAGES_STATUSBARBOTTOMBACKGROUNDCHROMIUM_PNG 20673 -#define IMAGES_STATUSBARBUTTONSCHROMIUM_PNG 20674 -#define IMAGES_STATUSBARMENUBUTTONCHROMIUM_PNG 20675 -#define IMAGES_STATUSBARMENUBUTTONSELECTEDCHROMIUM_PNG 20676 +#define DEVTOOLS_HTML 22000 +#define DEVTOOLS_JS 22001 +#define ELEMENTSPANEL_JS 22002 +#define RESOURCESPANEL_JS 22003 +#define NETWORKPANEL_JS 22004 +#define SCRIPTSPANEL_JS 22005 +#define TIMELINEPANEL_JS 22006 +#define PROFILESPANEL_JS 22007 +#define AUDITSPANEL_JS 22008 +#define CODEMIRRORTEXTEDITOR_JS 22009 +#define HEAPSNAPSHOTWORKER_JS 22010 +#define SCRIPTFORMATTERWORKER_JS 22011 +#define DEVTOOLS_CSS 22012 +#define DEVTOOLS_EXTENSION_API_JS 22013 +#define AUDITSPANEL_CSS 22014 +#define BREADCRUMBLIST_CSS 22015 +#define CODEMIRROR_CSS 22016 +#define CMDEVTOOLS_CSS 22017 +#define DATAGRID_CSS 22018 +#define ELEMENTSPANEL_CSS 22019 +#define FILTEREDITEMSELECTIONDIALOG_CSS 22020 +#define HEAPPROFILER_CSS 22021 +#define HELPSCREEN_CSS 22022 +#define INDEXEDDBVIEWS_CSS 22023 +#define INSPECTORCOMMON_CSS 22024 +#define NATIVEMEMORYPROFILER_CSS 22025 +#define NAVIGATORVIEW_CSS 22026 +#define NETWORKLOGVIEW_CSS 22027 +#define NETWORKPANEL_CSS 22028 +#define PANELENABLERVIEW_CSS 22029 +#define PROFILESPANEL_CSS 22030 +#define RESOURCEVIEW_CSS 22031 +#define RESOURCESPANEL_CSS 22032 +#define REVISIONHISTORY_CSS 22033 +#define SCRIPTSPANEL_CSS 22034 +#define SPLITVIEW_CSS 22035 +#define TABBEDPANE_CSS 22036 +#define TEXTEDITOR_CSS 22037 +#define TEXTPROMPT_CSS 22038 +#define TIMELINEPANEL_CSS 22039 +#define IMAGES_APPLICATIONCACHE_PNG 22040 +#define IMAGES_BACK_PNG 22041 +#define IMAGES_BREAKPOINTBORDER_PNG 22042 +#define IMAGES_BREAKPOINTCONDITIONALBORDER_PNG 22043 +#define IMAGES_BREAKPOINTCONDITIONALCOUNTERBORDER_PNG 22044 +#define IMAGES_BREAKPOINTCOUNTERBORDER_PNG 22045 +#define IMAGES_CHECKER_PNG 22046 +#define IMAGES_CLOSEBUTTONS_PNG 22047 +#define IMAGES_COOKIE_PNG 22048 +#define IMAGES_DATABASE_PNG 22049 +#define IMAGES_DATABASETABLE_PNG 22050 +#define IMAGES_DEBUGGERCONTINUE_PNG 22051 +#define IMAGES_DEBUGGERPAUSE_PNG 22052 +#define IMAGES_DEBUGGERSTEPINTO_PNG 22053 +#define IMAGES_DEBUGGERSTEPOUT_PNG 22054 +#define IMAGES_DEBUGGERSTEPOVER_PNG 22055 +#define IMAGES_DELETEICON_PNG 22056 +#define IMAGES_DISCLOSURETRIANGLESMALLDOWN_PNG 22057 +#define IMAGES_DISCLOSURETRIANGLESMALLDOWNBLACK_PNG 22058 +#define IMAGES_DISCLOSURETRIANGLESMALLDOWNWHITE_PNG 22059 +#define IMAGES_DISCLOSURETRIANGLESMALLRIGHT_PNG 22060 +#define IMAGES_DISCLOSURETRIANGLESMALLRIGHTBLACK_PNG 22061 +#define IMAGES_DISCLOSURETRIANGLESMALLRIGHTDOWN_PNG 22062 +#define IMAGES_DISCLOSURETRIANGLESMALLRIGHTDOWNBLACK_PNG 22063 +#define IMAGES_DISCLOSURETRIANGLESMALLRIGHTDOWNWHITE_PNG 22064 +#define IMAGES_DISCLOSURETRIANGLESMALLRIGHTWHITE_PNG 22065 +#define IMAGES_DOMAIN_PNG 22066 +#define IMAGES_ERRORICON_PNG 22067 +#define IMAGES_ERRORMEDIUMICON_PNG 22068 +#define IMAGES_ERRORREDDOT_PNG 22069 +#define IMAGES_FILESYSTEM_PNG 22070 +#define IMAGES_FORWARD_PNG 22071 +#define IMAGES_FRAME_PNG 22072 +#define IMAGES_GLOSSYHEADER_PNG 22073 +#define IMAGES_GLOSSYHEADERPRESSED_PNG 22074 +#define IMAGES_GLOSSYHEADERSELECTED_PNG 22075 +#define IMAGES_GLOSSYHEADERSELECTEDPRESSED_PNG 22076 +#define IMAGES_GOARROW_PNG 22077 +#define IMAGES_GRAPHLABELCALLOUTLEFT_PNG 22078 +#define IMAGES_GRAPHLABELCALLOUTRIGHT_PNG 22079 +#define IMAGES_INDEXEDDB_PNG 22080 +#define IMAGES_INDEXEDDBINDEX_PNG 22081 +#define IMAGES_INDEXEDDBOBJECTSTORE_PNG 22082 +#define IMAGES_LOCALSTORAGE_PNG 22083 +#define IMAGES_NAVIGATORSHOWHIDEBUTTON_PNG 22084 +#define IMAGES_PANEADDBUTTONS_PNG 22085 +#define IMAGES_PANEBOTTOMGROW_PNG 22086 +#define IMAGES_PANEBOTTOMGROWACTIVE_PNG 22087 +#define IMAGES_PANEELEMENTSTATEBUTTONS_PNG 22088 +#define IMAGES_PANEFILTERBUTTONS_PNG 22089 +#define IMAGES_PANEGROWHANDLELINE_PNG 22090 +#define IMAGES_PANEREFRESHBUTTONS_PNG 22091 +#define IMAGES_PANESETTINGSBUTTONS_PNG 22092 +#define IMAGES_POPOVERARROWS_PNG 22093 +#define IMAGES_POPOVERBACKGROUND_PNG 22094 +#define IMAGES_PROFILEGROUPICON_PNG 22095 +#define IMAGES_PROFILEICON_PNG 22096 +#define IMAGES_PROFILESMALLICON_PNG 22097 +#define IMAGES_PROFILESSILHOUETTE_PNG 22098 +#define IMAGES_PROGRAMCOUNTERBORDER_PNG 22099 +#define IMAGES_RADIODOT_PNG 22100 +#define IMAGES_RESOURCECSSICON_PNG 22101 +#define IMAGES_RESOURCEDOCUMENTICON_PNG 22102 +#define IMAGES_RESOURCEDOCUMENTICONSMALL_PNG 22103 +#define IMAGES_RESOURCEJSICON_PNG 22104 +#define IMAGES_RESOURCEPLAINICON_PNG 22105 +#define IMAGES_RESOURCEPLAINICONSMALL_PNG 22106 +#define IMAGES_RESOURCESSIZEGRAPHICON_PNG 22107 +#define IMAGES_RESOURCESTIMEGRAPHICON_PNG 22108 +#define IMAGES_SCRIPTSSILHOUETTE_PNG 22109 +#define IMAGES_SEARCHNEXT_PNG 22110 +#define IMAGES_SEARCHPREV_PNG 22111 +#define IMAGES_SEARCHSMALLBLUE_PNG 22112 +#define IMAGES_SEARCHSMALLBRIGHTBLUE_PNG 22113 +#define IMAGES_SEARCHSMALLGRAY_PNG 22114 +#define IMAGES_SEARCHSMALLWHITE_PNG 22115 +#define IMAGES_SEGMENT_PNG 22116 +#define IMAGES_SEGMENTEND_PNG 22117 +#define IMAGES_SEGMENTHOVER_PNG 22118 +#define IMAGES_SEGMENTHOVEREND_PNG 22119 +#define IMAGES_SEGMENTSELECTED_PNG 22120 +#define IMAGES_SEGMENTSELECTEDEND_PNG 22121 +#define IMAGES_SESSIONSTORAGE_PNG 22122 +#define IMAGES_SPINNER_GIF 22123 +#define IMAGES_SPINNERACTIVE_GIF 22124 +#define IMAGES_SPINNERACTIVESELECTED_GIF 22125 +#define IMAGES_SPINNERINACTIVE_GIF 22126 +#define IMAGES_SPINNERINACTIVESELECTED_GIF 22127 +#define IMAGES_SPLITVIEWDIMPLE_PNG 22128 +#define IMAGES_SPLITVIEWDIVIDERBACKGROUND_PNG 22129 +#define IMAGES_STATUSBARBUTTONGLYPHS_PNG 22130 +#define IMAGES_STATUSBARRESIZERHORIZONTAL_PNG 22131 +#define IMAGES_STATUSBARRESIZERVERTICAL_PNG 22132 +#define IMAGES_SUCCESSGREENDOT_PNG 22133 +#define IMAGES_THUMBACTIVEHORIZ_PNG 22134 +#define IMAGES_THUMBACTIVEVERT_PNG 22135 +#define IMAGES_THUMBHORIZ_PNG 22136 +#define IMAGES_THUMBHOVERHORIZ_PNG 22137 +#define IMAGES_THUMBHOVERVERT_PNG 22138 +#define IMAGES_THUMBVERT_PNG 22139 +#define IMAGES_TICKMARK_PNG 22140 +#define IMAGES_TIMELINEHOLLOWPILLBLUE_PNG 22141 +#define IMAGES_TIMELINEHOLLOWPILLGRAY_PNG 22142 +#define IMAGES_TIMELINEHOLLOWPILLGREEN_PNG 22143 +#define IMAGES_TIMELINEHOLLOWPILLORANGE_PNG 22144 +#define IMAGES_TIMELINEHOLLOWPILLPURPLE_PNG 22145 +#define IMAGES_TIMELINEHOLLOWPILLRED_PNG 22146 +#define IMAGES_TIMELINEHOLLOWPILLYELLOW_PNG 22147 +#define IMAGES_TIMELINEPILLBLUE_PNG 22148 +#define IMAGES_TIMELINEPILLGRAY_PNG 22149 +#define IMAGES_TIMELINEPILLGREEN_PNG 22150 +#define IMAGES_TIMELINEPILLORANGE_PNG 22151 +#define IMAGES_TIMELINEPILLPURPLE_PNG 22152 +#define IMAGES_TIMELINEPILLRED_PNG 22153 +#define IMAGES_TIMELINEPILLYELLOW_PNG 22154 +#define IMAGES_TOOLBARICONS_PNG 22155 +#define IMAGES_TOOLBARICONSSMALL_PNG 22156 +#define IMAGES_TOOLBARITEMSELECTED_PNG 22157 +#define IMAGES_TRACKHORIZ_PNG 22158 +#define IMAGES_TRACKVERT_PNG 22159 +#define IMAGES_TREEDOWNTRIANGLEBLACK_PNG 22160 +#define IMAGES_TREEDOWNTRIANGLEWHITE_PNG 22161 +#define IMAGES_TREERIGHTTRIANGLEBLACK_PNG 22162 +#define IMAGES_TREERIGHTTRIANGLEWHITE_PNG 22163 +#define IMAGES_TREEUPTRIANGLEBLACK_PNG 22164 +#define IMAGES_TREEUPTRIANGLEWHITE_PNG 22165 +#define IMAGES_USERINPUTICON_PNG 22166 +#define IMAGES_USERINPUTPREVIOUSICON_PNG 22167 +#define IMAGES_USERINPUTRESULTICON_PNG 22168 +#define IMAGES_WARNINGICON_PNG 22169 +#define IMAGES_WARNINGMEDIUMICON_PNG 22170 +#define IMAGES_WARNINGORANGEDOT_PNG 22171 +#define IMAGES_WARNINGSERRORS_PNG 22172 +#define IMAGES_SEGMENTCHROMIUM_PNG 22173 +#define IMAGES_SEGMENTHOVERCHROMIUM_PNG 22174 +#define IMAGES_SEGMENTHOVERENDCHROMIUM_PNG 22175 +#define IMAGES_SEGMENTSELECTEDCHROMIUM_PNG 22176 +#define IMAGES_SEGMENTSELECTEDENDCHROMIUM_PNG 22177 // --------------------------------------------------------------------------- // From net_resources.h: @@ -241,760 +242,740 @@ // --------------------------------------------------------------------------- // From ui_resources.h: -#define IDR_APP_TOP_CENTER 5500 -#define IDR_BROWSER_ACTION_BADGE_CENTER 5501 -#define IDR_BROWSER_ACTION_BADGE_LEFT 5502 -#define IDR_BROWSER_ACTION_BADGE_RIGHT 5503 -#define IDR_CHECKMARK 5504 -#define IDR_CLOSE 5505 -#define IDR_CLOSE_H 5506 -#define IDR_CLOSE_P 5507 -#define IDR_CONTENT_BOTTOM_CENTER 5511 -#define IDR_CONTENT_BOTTOM_LEFT_CORNER 5512 -#define IDR_CONTENT_BOTTOM_RIGHT_CORNER 5513 -#define IDR_CONTENT_LEFT_SIDE 5514 -#define IDR_CONTENT_RIGHT_SIDE 5515 -#define IDR_DEFAULT_FAVICON 5516 -#define IDR_DEFAULT_LARGE_FAVICON 5517 -#define IDR_FOLDER_CLOSED 5518 -#define IDR_FOLDER_CLOSED_RTL 5519 -#define IDR_FOLDER_OPEN 5520 -#define IDR_FOLDER_OPEN_RTL 5521 -#define IDR_FRAME 5522 -#define IDR_FRAME_APP_PANEL 5523 -#define IDR_FRAME_INACTIVE 5524 -#define IDR_MAXIMIZE 5525 -#define IDR_MAXIMIZE_H 5526 -#define IDR_MAXIMIZE_P 5527 -#define IDR_MENU_DROPARROW 5531 -#define IDR_MENU_DROPARROW_SHARP 5532 -#define IDR_MINIMIZE 5533 -#define IDR_MINIMIZE_H 5534 -#define IDR_MINIMIZE_P 5535 -#define IDR_RESTORE 5539 -#define IDR_RESTORE_H 5540 -#define IDR_RESTORE_P 5541 -#define IDR_TEXTBUTTON_HOVER_BOTTOM 5545 -#define IDR_TEXTBUTTON_HOVER_BOTTOM_LEFT 5546 -#define IDR_TEXTBUTTON_PRESSED_BOTTOM_LEFT 5547 -#define IDR_TEXTBUTTON_PRESSED_BOTTOM 5548 -#define IDR_TEXTBUTTON_HOVER_BOTTOM_RIGHT 5549 -#define IDR_TEXTBUTTON_PRESSED_BOTTOM_RIGHT 5550 -#define IDR_TEXTBUTTON_HOVER_CENTER 5551 -#define IDR_TEXTBUTTON_PRESSED_CENTER 5552 -#define IDR_TEXTBUTTON_HOVER_LEFT 5553 -#define IDR_TEXTBUTTON_PRESSED_LEFT 5554 -#define IDR_TEXTBUTTON_HOVER_RIGHT 5555 -#define IDR_TEXTBUTTON_PRESSED_RIGHT 5556 -#define IDR_TEXTBUTTON_HOVER_TOP 5557 -#define IDR_TEXTBUTTON_HOVER_TOP_LEFT 5558 -#define IDR_TEXTBUTTON_PRESSED_TOP_LEFT 5559 -#define IDR_TEXTBUTTON_PRESSED_TOP 5560 -#define IDR_TEXTBUTTON_HOVER_TOP_RIGHT 5561 -#define IDR_TEXTBUTTON_PRESSED_TOP_RIGHT 5562 -#define IDR_WINDOW_BOTTOM_CENTER 5581 -#define IDR_WINDOW_BOTTOM_LEFT_CORNER 5582 -#define IDR_WINDOW_BOTTOM_RIGHT_CORNER 5583 -#define IDR_WINDOW_LEFT_SIDE 5584 -#define IDR_WINDOW_RIGHT_SIDE 5585 -#define IDR_WINDOW_TOP_CENTER 5586 -#define IDR_WINDOW_TOP_LEFT_CORNER 5587 -#define IDR_WINDOW_TOP_RIGHT_CORNER 5588 -#define IDR_PANEL_BOTTOM_LEFT_CORNER 5589 -#define IDR_PANEL_BOTTOM_RIGHT_CORNER 5590 -#define IDR_APP_TOP_LEFT 5591 -#define IDR_APP_TOP_RIGHT 5592 -#define IDR_CLOSE_SA 5593 -#define IDR_CLOSE_SA_H 5594 -#define IDR_CLOSE_SA_P 5595 -#define IDR_DISCLOSURE_ARROW 5596 -#define IDR_MENU_ARROW 5597 -#define IDR_MENU_CHECK 5598 -#define IDR_AURA_LAUNCHER_BROWSER_SHORTCUT 5599 -#define IDR_AURA_LAUNCHER_BROWSER 5600 -#define IDR_AURA_LAUNCHER_BROWSER_PANEL 5601 -#define IDR_AURA_LAUNCHER_ICON_APPLIST 5602 -#define IDR_AURA_LAUNCHER_ICON_APPLIST_HOT 5603 -#define IDR_AURA_LAUNCHER_ICON_APPLIST_PUSHED 5604 -#define IDR_AURA_LAUNCHER_INCOGNITO_BROWSER 5605 -#define IDR_AURA_LAUNCHER_INCOGNITO_BROWSER_PANEL 5606 -#define IDR_AURA_LAUNCHER_NEW_BROWSER 5607 -#define IDR_AURA_LAUNCHER_NEW_BROWSER_HOT 5608 -#define IDR_AURA_LAUNCHER_NEW_BROWSER_PUSHED 5609 -#define IDR_AURA_LAUNCHER_OVERFLOW 5610 -#define IDR_AURA_LAUNCHER_OVERFLOW_HOT 5611 -#define IDR_AURA_LAUNCHER_OVERFLOW_PUSHED 5612 -#define IDR_AURA_LAUNCHER_UNDERLINE_ACTIVE 5613 -#define IDR_AURA_LAUNCHER_UNDERLINE_HOVER 5614 -#define IDR_AURA_LAUNCHER_UNDERLINE_RUNNING 5615 -#define IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_ACTIVE 5616 -#define IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_HOVER 5617 -#define IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_RUNNING 5618 -#define IDR_AURA_MULTI_WINDOW_RESIZE_H 5619 -#define IDR_AURA_MULTI_WINDOW_RESIZE_V 5620 -#define IDR_AURA_RESIZE_SHADOW_TOP_LEFT 5621 -#define IDR_AURA_RESIZE_SHADOW_TOP 5622 -#define IDR_AURA_RESIZE_SHADOW_TOP_RIGHT 5623 -#define IDR_AURA_RESIZE_SHADOW_LEFT 5624 -#define IDR_AURA_RESIZE_SHADOW_RIGHT 5625 -#define IDR_AURA_RESIZE_SHADOW_BOTTOM_LEFT 5626 -#define IDR_AURA_RESIZE_SHADOW_BOTTOM 5627 -#define IDR_AURA_RESIZE_SHADOW_BOTTOM_RIGHT 5628 -#define IDR_AURA_SHADOW_ACTIVE_TOP_LEFT 5629 -#define IDR_AURA_SHADOW_ACTIVE_TOP 5630 -#define IDR_AURA_SHADOW_ACTIVE_TOP_RIGHT 5631 -#define IDR_AURA_SHADOW_ACTIVE_LEFT 5632 -#define IDR_AURA_SHADOW_ACTIVE_RIGHT 5633 -#define IDR_AURA_SHADOW_ACTIVE_BOTTOM_LEFT 5634 -#define IDR_AURA_SHADOW_ACTIVE_BOTTOM 5635 -#define IDR_AURA_SHADOW_ACTIVE_BOTTOM_RIGHT 5636 -#define IDR_AURA_SHADOW_INACTIVE_TOP_LEFT 5637 -#define IDR_AURA_SHADOW_INACTIVE_TOP 5638 -#define IDR_AURA_SHADOW_INACTIVE_TOP_RIGHT 5639 -#define IDR_AURA_SHADOW_INACTIVE_LEFT 5640 -#define IDR_AURA_SHADOW_INACTIVE_RIGHT 5641 -#define IDR_AURA_SHADOW_INACTIVE_BOTTOM_LEFT 5642 -#define IDR_AURA_SHADOW_INACTIVE_BOTTOM 5643 -#define IDR_AURA_SHADOW_INACTIVE_BOTTOM_RIGHT 5644 -#define IDR_AURA_SHADOW_SMALL_TOP_LEFT 5645 -#define IDR_AURA_SHADOW_SMALL_TOP 5646 -#define IDR_AURA_SHADOW_SMALL_TOP_RIGHT 5647 -#define IDR_AURA_SHADOW_SMALL_LEFT 5648 -#define IDR_AURA_SHADOW_SMALL_RIGHT 5649 -#define IDR_AURA_SHADOW_SMALL_BOTTOM_LEFT 5650 -#define IDR_AURA_SHADOW_SMALL_BOTTOM 5651 -#define IDR_AURA_SHADOW_SMALL_BOTTOM_RIGHT 5652 -#define IDR_AURA_STATUS_MOCK 5653 -#define IDR_AURA_WALLPAPERS_ROMAINGUY_0 5654 -#define IDR_AURA_WALLPAPERS_ROMAINGUY_0_THUMB 5655 -#define IDR_AURA_WALLPAPERS_1_NATURE0 5656 -#define IDR_AURA_WALLPAPERS_1_NATURE0_THUMB 5657 -#define IDR_AURA_WALLPAPERS_1_NATURE1 5658 -#define IDR_AURA_WALLPAPERS_1_NATURE1_THUMB 5659 -#define IDR_AURA_WALLPAPERS_1_NATURE2 5660 -#define IDR_AURA_WALLPAPERS_1_NATURE2_THUMB 5661 -#define IDR_AURA_WALLPAPERS_1_NATURE3 5662 -#define IDR_AURA_WALLPAPERS_1_NATURE3_THUMB 5663 -#define IDR_AURA_WALLPAPERS_1_NATURE4 5664 -#define IDR_AURA_WALLPAPERS_1_NATURE4_THUMB 5665 -#define IDR_AURA_WALLPAPERS_1_NATURE5 5666 -#define IDR_AURA_WALLPAPERS_1_NATURE5_THUMB 5667 -#define IDR_AURA_WALLPAPERS_1_NATURE6 5668 -#define IDR_AURA_WALLPAPERS_1_NATURE6_THUMB 5669 -#define IDR_AURA_WALLPAPERS_1_NATURE7 5670 -#define IDR_AURA_WALLPAPERS_1_NATURE7_THUMB 5671 -#define IDR_AURA_WALLPAPERS_2_LANDSCAPE0 5672 -#define IDR_AURA_WALLPAPERS_2_LANDSCAPE0_THUMB 5673 -#define IDR_AURA_WALLPAPERS_2_LANDSCAPE1 5674 -#define IDR_AURA_WALLPAPERS_2_LANDSCAPE1_THUMB 5675 -#define IDR_AURA_WALLPAPERS_2_LANDSCAPE2 5676 -#define IDR_AURA_WALLPAPERS_2_LANDSCAPE2_THUMB 5677 -#define IDR_AURA_WALLPAPERS_2_LANDSCAPE3 5678 -#define IDR_AURA_WALLPAPERS_2_LANDSCAPE3_THUMB 5679 -#define IDR_AURA_WALLPAPERS_2_LANDSCAPE4 5680 -#define IDR_AURA_WALLPAPERS_2_LANDSCAPE4_THUMB 5681 -#define IDR_AURA_WALLPAPERS_2_LANDSCAPE5 5682 -#define IDR_AURA_WALLPAPERS_2_LANDSCAPE5_THUMB 5683 -#define IDR_AURA_WALLPAPERS_2_LANDSCAPE6 5684 -#define IDR_AURA_WALLPAPERS_2_LANDSCAPE6_THUMB 5685 -#define IDR_AURA_WALLPAPERS_2_LANDSCAPE7 5686 -#define IDR_AURA_WALLPAPERS_2_LANDSCAPE7_THUMB 5687 -#define IDR_AURA_WALLPAPERS_3_URBAN0 5688 -#define IDR_AURA_WALLPAPERS_3_URBAN0_THUMB 5689 -#define IDR_AURA_WALLPAPERS_3_URBAN1 5690 -#define IDR_AURA_WALLPAPERS_3_URBAN1_THUMB 5691 -#define IDR_AURA_WALLPAPERS_3_URBAN2 5692 -#define IDR_AURA_WALLPAPERS_3_URBAN2_THUMB 5693 -#define IDR_AURA_WALLPAPERS_3_URBAN3 5694 -#define IDR_AURA_WALLPAPERS_3_URBAN3_THUMB 5695 -#define IDR_AURA_WALLPAPERS_5_GRADIENT0 5696 -#define IDR_AURA_WALLPAPERS_5_GRADIENT0_THUMB 5697 -#define IDR_AURA_WALLPAPERS_5_GRADIENT1 5698 -#define IDR_AURA_WALLPAPERS_5_GRADIENT1_THUMB 5699 -#define IDR_AURA_WALLPAPERS_5_GRADIENT2 5700 -#define IDR_AURA_WALLPAPERS_5_GRADIENT2_THUMB 5701 -#define IDR_AURA_WALLPAPERS_5_GRADIENT3 5702 -#define IDR_AURA_WALLPAPERS_5_GRADIENT3_THUMB 5703 -#define IDR_AURA_WALLPAPERS_5_GRADIENT4 5704 -#define IDR_AURA_WALLPAPERS_5_GRADIENT4_THUMB 5705 -#define IDR_AURA_WALLPAPERS_5_GRADIENT5 5706 -#define IDR_AURA_WALLPAPERS_5_GRADIENT5_THUMB 5707 -#define IDR_AURA_WALLPAPERS_5_GRADIENT6 5708 -#define IDR_AURA_WALLPAPERS_5_GRADIENT6_THUMB 5709 -#define IDR_AURA_WALLPAPERS_5_GRADIENT7 5710 -#define IDR_AURA_WALLPAPERS_5_GRADIENT7_THUMB 5711 -#define IDR_AURA_WINDOW_CLOSE_ICON 5712 -#define IDR_AURA_WINDOW_FULLSCREEN_SHADOW 5713 -#define IDR_AURA_WINDOW_HEADER_BASE_ACTIVE 5714 -#define IDR_AURA_WINDOW_HEADER_BASE_INACTIVE 5715 -#define IDR_AURA_WINDOW_HEADER_BASE_INCOGNITO_ACTIVE 5716 -#define IDR_AURA_WINDOW_HEADER_BASE_INCOGNITO_INACTIVE 5717 -#define IDR_AURA_WINDOW_HEADER_SHADE_BOTTOM 5718 -#define IDR_AURA_WINDOW_HEADER_SHADE_BOTTOM_LEFT 5719 -#define IDR_AURA_WINDOW_HEADER_SHADE_BOTTOM_RIGHT 5720 -#define IDR_AURA_WINDOW_HEADER_SHADE_LEFT 5721 -#define IDR_AURA_WINDOW_HEADER_SHADE_MIDDLE 5722 -#define IDR_AURA_WINDOW_HEADER_SHADE_RIGHT 5723 -#define IDR_AURA_WINDOW_HEADER_SHADE_TOP 5724 -#define IDR_AURA_WINDOW_HEADER_SHADE_TOP_LEFT 5725 -#define IDR_AURA_WINDOW_HEADER_SHADE_TOP_RIGHT 5726 -#define IDR_AURA_WINDOW_ZOOM_ICON 5727 -#define IDR_AURA_SWITCH_MONITOR 5728 -#define IDR_OAK 5729 - -// --------------------------------------------------------------------------- -// From ui_resources_standard.h: - -#define IDR_BUBBLE_B 24000 -#define IDR_BUBBLE_BL 24001 -#define IDR_BUBBLE_BR 24002 -#define IDR_BUBBLE_B_ARROW 24003 -#define IDR_BUBBLE_L 24004 -#define IDR_BUBBLE_L_ARROW 24005 -#define IDR_BUBBLE_R 24006 -#define IDR_BUBBLE_R_ARROW 24007 -#define IDR_BUBBLE_T 24008 -#define IDR_BUBBLE_TL 24009 -#define IDR_BUBBLE_TR 24010 -#define IDR_BUBBLE_T_ARROW 24011 -#define IDR_BUBBLE_SHADOW_B 24012 -#define IDR_BUBBLE_SHADOW_BL 24013 -#define IDR_BUBBLE_SHADOW_BR 24014 -#define IDR_BUBBLE_SHADOW_L 24015 -#define IDR_BUBBLE_SHADOW_R 24016 -#define IDR_BUBBLE_SHADOW_T 24017 -#define IDR_BUBBLE_SHADOW_TL 24018 -#define IDR_BUBBLE_SHADOW_TR 24019 -#define IDR_CLOSE_BAR 24020 -#define IDR_CLOSE_BAR_H 24021 -#define IDR_CLOSE_BAR_MASK 24022 -#define IDR_CLOSE_BAR_P 24023 -#define IDR_THROBBER 24024 -#define IDR_AURA_WINDOW_BUTTON_SEPARATOR 24025 -#define IDR_AURA_WINDOW_CLOSE 24026 -#define IDR_AURA_WINDOW_CLOSE_H 24027 -#define IDR_AURA_WINDOW_CLOSE_P 24028 -#define IDR_AURA_WINDOW_FULLSCREEN_CLOSE 24029 -#define IDR_AURA_WINDOW_FULLSCREEN_CLOSE_H 24030 -#define IDR_AURA_WINDOW_FULLSCREEN_CLOSE_P 24031 -#define IDR_AURA_WINDOW_FULLSCREEN_RESTORE 24032 -#define IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H 24033 -#define IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P 24034 -#define IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR 24035 -#define IDR_AURA_WINDOW_MAXIMIZE 24043 -#define IDR_AURA_WINDOW_MAXIMIZE_H 24044 -#define IDR_AURA_WINDOW_MAXIMIZE_P 24045 -#define IDR_AURA_WINDOW_MAXIMIZED_CLOSE 24046 -#define IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H 24047 -#define IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P 24048 -#define IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE 24052 -#define IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_H 24053 -#define IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_P 24054 -#define IDR_AURA_WINDOW_MAXIMIZED_SNAP_LEFT_P 24055 -#define IDR_AURA_WINDOW_MAXIMIZED_SNAP_MINIMIZE_P 24056 -#define IDR_AURA_WINDOW_MAXIMIZED_SNAP_P 24057 -#define IDR_AURA_WINDOW_MAXIMIZED_SNAP_RIGHT_P 24058 -#define IDR_AURA_WINDOW_MAXIMIZED_RESTORE 24059 -#define IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H 24060 -#define IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P 24061 -#define IDR_AURA_WINDOW_SNAP_LEFT_P 24069 -#define IDR_AURA_WINDOW_SNAP_MINIMIZE_P 24070 -#define IDR_AURA_WINDOW_SNAP_P 24071 -#define IDR_AURA_WINDOW_SNAP_RIGHT_P 24072 -#define IDR_AURA_CURSOR_PTR 24073 -#define IDR_AURA_CURSOR_NO_DROP 24074 -#define IDR_AURA_CURSOR_COPY 24075 -#define IDR_AURA_CURSOR_HAND 24076 -#define IDR_AURA_CURSOR_FLEUR 24077 -#define IDR_AURA_CURSOR_IBEAM 24078 -#define IDR_AURA_CURSOR_NORTH_WEST_RESIZE 24079 -#define IDR_AURA_CURSOR_SOUTH_EAST_RESIZE 24080 -#define IDR_AURA_CURSOR_NORTH_EAST_RESIZE 24081 -#define IDR_AURA_CURSOR_SOUTH_WEST_RESIZE 24082 -#define IDR_AURA_CURSOR_NORTH_RESIZE 24083 -#define IDR_AURA_CURSOR_EAST_RESIZE 24084 -#define IDR_AURA_CURSOR_SOUTH_RESIZE 24085 -#define IDR_AURA_CURSOR_WEST_RESIZE 24086 -#define IDR_AURA_CURSOR_ALIAS 24087 -#define IDR_AURA_CURSOR_CELL 24088 -#define IDR_AURA_CURSOR_CONTEXT_MENU 24089 -#define IDR_AURA_CURSOR_CROSSHAIR 24090 -#define IDR_AURA_CURSOR_HELP 24091 -#define IDR_AURA_CURSOR_MOVE 24092 -#define IDR_AURA_CURSOR_XTERM_HORIZ 24093 -#define IDR_AURA_CURSOR_ZOOM_IN 24094 -#define IDR_AURA_CURSOR_ZOOM_OUT 24095 -#define IDR_AURA_CURSOR_ROW_RESIZE 24096 -#define IDR_AURA_CURSOR_COL_RESIZE 24097 -#define IDR_AURA_CURSOR_NORTH_WEST_SOUTH_EAST_RESIZE 24098 -#define IDR_AURA_CURSOR_NORTH_EAST_SOUTH_WEST_RESIZE 24099 -#define IDR_AURA_CURSOR_NORTH_SOUTH_RESIZE 24100 -#define IDR_AURA_CURSOR_EAST_WEST_RESIZE 24101 -#define IDR_AURA_UBER_TRAY_VOLUME_LEVELS 24102 -#define IDR_AURA_UBER_TRAY_VOLUME_MUTE 24103 -#define IDR_AURA_UBER_TRAY_BRIGHTNESS 24104 -#define IDR_AURA_UBER_TRAY_SETTINGS 24105 -#define IDR_AURA_UBER_TRAY_POWER_SMALL 24106 -#define IDR_AURA_UBER_TRAY_POWER_SMALL_DARK 24107 -#define IDR_AURA_UBER_TRAY_NETWORK_AIRPLANE 24108 -#define IDR_AURA_UBER_TRAY_NETWORK_INFO 24109 -#define IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER 24110 -#define IDR_AURA_UBER_TRAY_NETWORK_FAILED 24111 -#define IDR_AURA_UBER_TRAY_NETWORK_DATA_LOW 24112 -#define IDR_AURA_UBER_TRAY_NETWORK_DATA_NONE 24113 -#define IDR_AURA_UBER_TRAY_SMS 24114 -#define IDR_AURA_UBER_TRAY_MORE 24115 -#define IDR_AURA_UBER_TRAY_LESS 24116 -#define IDR_AURA_UBER_TRAY_ACCESSIBILITY 24117 -#define IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK 24118 -#define IDR_AURA_UBER_TRAY_CAPS_LOCK 24119 -#define IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK 24120 -#define IDR_AURA_UBER_TRAY_BLUETOOTH 24121 -#define IDR_AURA_UBER_TRAY_DRIVE 24122 -#define IDR_AURA_UBER_TRAY_DRIVE_FAILED 24123 -#define IDR_AURA_UBER_TRAY_DRIVE_DONE 24124 -#define IDR_AURA_UBER_TRAY_DRIVE_CANCEL 24125 -#define IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER 24126 -#define IDR_AURA_UBER_TRAY_DRIVE_LIGHT 24127 -#define IDR_AURA_UBER_TRAY_IME 24128 -#define IDR_AURA_UBER_TRAY_UPDATE 24129 -#define IDR_AURA_UBER_TRAY_UPDATE_DARK 24130 -#define IDR_AURA_UBER_TRAY_WIFI_ENABLED 24131 -#define IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER 24132 -#define IDR_AURA_UBER_TRAY_WIFI_DISABLED 24133 -#define IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER 24134 -#define IDR_AURA_UBER_TRAY_CELLULAR_ENABLED 24135 -#define IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER 24136 -#define IDR_AURA_UBER_TRAY_CELLULAR_DISABLED 24137 -#define IDR_AURA_UBER_TRAY_CELLULAR_DISABLED_HOVER 24138 -#define IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED 24139 -#define IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER 24140 -#define IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED 24141 -#define IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER 24142 -#define IDR_AURA_UBER_TRAY_SHUTDOWN 24143 -#define IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER 24144 -#define IDR_AURA_UBER_TRAY_LOCKSCREEN 24145 -#define IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER 24146 -#define IDR_AURA_UBER_TRAY_HELP 24147 -#define IDR_AURA_UBER_TRAY_HELP_HOVER 24148 -#define IDR_AURA_UBER_TRAY_LOCALE 24149 -#define IDR_AURA_UBER_TRAY_WEB_NOTIFICATON 24150 -#define IDR_CHECKBOX_DISABLED_INDETERMINATE 24151 -#define IDR_CHECKBOX_DISABLED_OFF 24152 -#define IDR_CHECKBOX_DISABLED_ON 24153 -#define IDR_CHECKBOX_INDETERMINATE 24154 -#define IDR_CHECKBOX_OFF 24155 -#define IDR_CHECKBOX_ON 24156 -#define IDR_RADIO_DISABLED_OFF 24157 -#define IDR_RADIO_DISABLED_ON 24158 -#define IDR_RADIO_OFF 24159 -#define IDR_RADIO_ON 24160 -#define IDR_PROGRESS_BAR 24161 -#define IDR_PROGRESS_BORDER_LEFT 24162 -#define IDR_PROGRESS_BORDER_RIGHT 24163 -#define IDR_PROGRESS_VALUE 24164 -#define IDR_SCROLL_BASE_CORNER 24179 -#define IDR_SCROLL_BASE_CORNER_H 24180 -#define IDR_SCROLL_BASE_HORIZONTAL_CENTER 24181 -#define IDR_SCROLL_BASE_HORIZONTAL_CENTER_H 24182 -#define IDR_SCROLL_BASE_HORIZONTAL_LEFT 24183 -#define IDR_SCROLL_BASE_HORIZONTAL_LEFT_H 24184 -#define IDR_SCROLL_BASE_HORIZONTAL_RIGHT 24185 -#define IDR_SCROLL_BASE_HORIZONTAL_RIGHT_H 24186 -#define IDR_SCROLL_BASE_VERTICAL_BOTTOM 24187 -#define IDR_SCROLL_BASE_VERTICAL_BOTTOM_H 24188 -#define IDR_SCROLL_BASE_VERTICAL_CENTER 24189 -#define IDR_SCROLL_BASE_VERTICAL_CENTER_H 24190 -#define IDR_SCROLL_BASE_VERTICAL_TOP 24191 -#define IDR_SCROLL_BASE_VERTICAL_TOP_H 24192 -#define IDR_SCROLL_THUMB_HORIZONTAL_CENTER 24193 -#define IDR_SCROLL_THUMB_HORIZONTAL_CENTER_H 24194 -#define IDR_SCROLL_THUMB_HORIZONTAL_CENTER_P 24195 -#define IDR_SCROLL_THUMB_HORIZONTAL_LEFT 24196 -#define IDR_SCROLL_THUMB_HORIZONTAL_LEFT_H 24197 -#define IDR_SCROLL_THUMB_HORIZONTAL_LEFT_P 24198 -#define IDR_SCROLL_THUMB_HORIZONTAL_RIGHT 24199 -#define IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_H 24200 -#define IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_P 24201 -#define IDR_SCROLL_THUMB_VERTICAL_BOTTOM 24202 -#define IDR_SCROLL_THUMB_VERTICAL_BOTTOM_H 24203 -#define IDR_SCROLL_THUMB_VERTICAL_BOTTOM_P 24204 -#define IDR_SCROLL_THUMB_VERTICAL_CENTER 24205 -#define IDR_SCROLL_THUMB_VERTICAL_CENTER_H 24206 -#define IDR_SCROLL_THUMB_VERTICAL_CENTER_P 24207 -#define IDR_SCROLL_THUMB_VERTICAL_TOP 24208 -#define IDR_SCROLL_THUMB_VERTICAL_TOP_H 24209 -#define IDR_SCROLL_THUMB_VERTICAL_TOP_P 24210 +#define IDR_APP_TOP_CENTER 6000 +#define IDR_APP_TOP_LEFT 6001 +#define IDR_APP_TOP_RIGHT 6002 +#define IDR_AURA_CURSOR_ALIAS 6003 +#define IDR_AURA_CURSOR_CELL 6004 +#define IDR_AURA_CURSOR_COL_RESIZE 6005 +#define IDR_AURA_CURSOR_CONTEXT_MENU 6006 +#define IDR_AURA_CURSOR_COPY 6007 +#define IDR_AURA_CURSOR_CROSSHAIR 6008 +#define IDR_AURA_CURSOR_EAST_RESIZE 6009 +#define IDR_AURA_CURSOR_EAST_WEST_RESIZE 6010 +#define IDR_AURA_CURSOR_FLEUR 6011 +#define IDR_AURA_CURSOR_HAND 6012 +#define IDR_AURA_CURSOR_HELP 6013 +#define IDR_AURA_CURSOR_IBEAM 6014 +#define IDR_AURA_CURSOR_MOVE 6015 +#define IDR_AURA_CURSOR_NORTH_EAST_RESIZE 6016 +#define IDR_AURA_CURSOR_NORTH_EAST_SOUTH_WEST_RESIZE 6017 +#define IDR_AURA_CURSOR_NORTH_RESIZE 6018 +#define IDR_AURA_CURSOR_NORTH_SOUTH_RESIZE 6019 +#define IDR_AURA_CURSOR_NORTH_WEST_RESIZE 6020 +#define IDR_AURA_CURSOR_NORTH_WEST_SOUTH_EAST_RESIZE 6021 +#define IDR_AURA_CURSOR_NO_DROP 6022 +#define IDR_AURA_CURSOR_PTR 6023 +#define IDR_AURA_CURSOR_ROW_RESIZE 6024 +#define IDR_AURA_CURSOR_SOUTH_EAST_RESIZE 6025 +#define IDR_AURA_CURSOR_SOUTH_RESIZE 6026 +#define IDR_AURA_CURSOR_SOUTH_WEST_RESIZE 6027 +#define IDR_AURA_CURSOR_WEST_RESIZE 6028 +#define IDR_AURA_CURSOR_XTERM_HORIZ 6029 +#define IDR_AURA_CURSOR_ZOOM_IN 6030 +#define IDR_AURA_CURSOR_ZOOM_OUT 6031 +#define IDR_AURA_LAUNCHER_BROWSER 6032 +#define IDR_AURA_LAUNCHER_BROWSER_PANEL 6033 +#define IDR_AURA_LAUNCHER_BROWSER_SHORTCUT 6034 +#define IDR_AURA_LAUNCHER_ICON_APPLIST 6035 +#define IDR_AURA_LAUNCHER_ICON_APPLIST_HOT 6036 +#define IDR_AURA_LAUNCHER_ICON_APPLIST_PUSHED 6037 +#define IDR_AURA_LAUNCHER_INCOGNITO_BROWSER 6038 +#define IDR_AURA_LAUNCHER_INCOGNITO_BROWSER_PANEL 6039 +#define IDR_AURA_LAUNCHER_NEW_BROWSER 6040 +#define IDR_AURA_LAUNCHER_NEW_BROWSER_HOT 6041 +#define IDR_AURA_LAUNCHER_NEW_BROWSER_PUSHED 6042 +#define IDR_AURA_LAUNCHER_OVERFLOW 6043 +#define IDR_AURA_LAUNCHER_UNDERLINE_ACTIVE 6044 +#define IDR_AURA_LAUNCHER_UNDERLINE_HOVER 6045 +#define IDR_AURA_LAUNCHER_UNDERLINE_RUNNING 6046 +#define IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_ACTIVE 6047 +#define IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_HOVER 6048 +#define IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_RUNNING 6049 +#define IDR_AURA_MULTI_WINDOW_RESIZE_H 6050 +#define IDR_AURA_MULTI_WINDOW_RESIZE_V 6051 +#define IDR_AURA_RESIZE_SHADOW_BOTTOM 6052 +#define IDR_AURA_RESIZE_SHADOW_BOTTOM_LEFT 6053 +#define IDR_AURA_RESIZE_SHADOW_BOTTOM_RIGHT 6054 +#define IDR_AURA_RESIZE_SHADOW_LEFT 6055 +#define IDR_AURA_RESIZE_SHADOW_RIGHT 6056 +#define IDR_AURA_RESIZE_SHADOW_TOP 6057 +#define IDR_AURA_RESIZE_SHADOW_TOP_LEFT 6058 +#define IDR_AURA_RESIZE_SHADOW_TOP_RIGHT 6059 +#define IDR_AURA_SHADOW_ACTIVE_BOTTOM 6060 +#define IDR_AURA_SHADOW_ACTIVE_BOTTOM_LEFT 6061 +#define IDR_AURA_SHADOW_ACTIVE_BOTTOM_RIGHT 6062 +#define IDR_AURA_SHADOW_ACTIVE_LEFT 6063 +#define IDR_AURA_SHADOW_ACTIVE_RIGHT 6064 +#define IDR_AURA_SHADOW_ACTIVE_TOP 6065 +#define IDR_AURA_SHADOW_ACTIVE_TOP_LEFT 6066 +#define IDR_AURA_SHADOW_ACTIVE_TOP_RIGHT 6067 +#define IDR_AURA_SHADOW_INACTIVE_BOTTOM 6068 +#define IDR_AURA_SHADOW_INACTIVE_BOTTOM_LEFT 6069 +#define IDR_AURA_SHADOW_INACTIVE_BOTTOM_RIGHT 6070 +#define IDR_AURA_SHADOW_INACTIVE_LEFT 6071 +#define IDR_AURA_SHADOW_INACTIVE_RIGHT 6072 +#define IDR_AURA_SHADOW_INACTIVE_TOP 6073 +#define IDR_AURA_SHADOW_INACTIVE_TOP_LEFT 6074 +#define IDR_AURA_SHADOW_INACTIVE_TOP_RIGHT 6075 +#define IDR_AURA_SHADOW_SMALL_BOTTOM 6076 +#define IDR_AURA_SHADOW_SMALL_BOTTOM_LEFT 6077 +#define IDR_AURA_SHADOW_SMALL_BOTTOM_RIGHT 6078 +#define IDR_AURA_SHADOW_SMALL_LEFT 6079 +#define IDR_AURA_SHADOW_SMALL_RIGHT 6080 +#define IDR_AURA_SHADOW_SMALL_TOP 6081 +#define IDR_AURA_SHADOW_SMALL_TOP_LEFT 6082 +#define IDR_AURA_SHADOW_SMALL_TOP_RIGHT 6083 +#define IDR_AURA_SWITCH_MONITOR 6084 +#define IDR_AURA_UBER_TRAY_ACCESSIBILITY 6085 +#define IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK 6086 +#define IDR_AURA_UBER_TRAY_BLUETOOTH 6087 +#define IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED 6088 +#define IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER 6089 +#define IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED 6090 +#define IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER 6091 +#define IDR_AURA_UBER_TRAY_BRIGHTNESS 6092 +#define IDR_AURA_UBER_TRAY_CAPS_LOCK 6093 +#define IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK 6094 +#define IDR_AURA_UBER_TRAY_CELLULAR_DISABLED 6095 +#define IDR_AURA_UBER_TRAY_CELLULAR_DISABLED_HOVER 6096 +#define IDR_AURA_UBER_TRAY_CELLULAR_ENABLED 6097 +#define IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER 6098 +#define IDR_AURA_UBER_TRAY_DRIVE 6099 +#define IDR_AURA_UBER_TRAY_DRIVE_CANCEL 6100 +#define IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER 6101 +#define IDR_AURA_UBER_TRAY_DRIVE_DONE 6102 +#define IDR_AURA_UBER_TRAY_DRIVE_FAILED 6103 +#define IDR_AURA_UBER_TRAY_DRIVE_LIGHT 6104 +#define IDR_AURA_UBER_TRAY_HELP 6105 +#define IDR_AURA_UBER_TRAY_HELP_HOVER 6106 +#define IDR_AURA_UBER_TRAY_IME 6107 +#define IDR_AURA_UBER_TRAY_LESS 6108 +#define IDR_AURA_UBER_TRAY_LOCALE 6109 +#define IDR_AURA_UBER_TRAY_LOCKSCREEN 6110 +#define IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER 6111 +#define IDR_AURA_UBER_TRAY_MORE 6112 +#define IDR_AURA_UBER_TRAY_NETWORK_AIRPLANE 6113 +#define IDR_AURA_UBER_TRAY_NETWORK_DATA_LOW 6114 +#define IDR_AURA_UBER_TRAY_NETWORK_DATA_NONE 6115 +#define IDR_AURA_UBER_TRAY_NETWORK_FAILED 6116 +#define IDR_AURA_UBER_TRAY_NETWORK_INFO 6117 +#define IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER 6118 +#define IDR_AURA_UBER_TRAY_POWER_SMALL 6119 +#define IDR_AURA_UBER_TRAY_POWER_SMALL_DARK 6120 +#define IDR_AURA_UBER_TRAY_SETTINGS 6121 +#define IDR_AURA_UBER_TRAY_SHUTDOWN 6122 +#define IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER 6123 +#define IDR_AURA_UBER_TRAY_SMS 6124 +#define IDR_AURA_UBER_TRAY_UPDATE 6125 +#define IDR_AURA_UBER_TRAY_UPDATE_DARK 6126 +#define IDR_AURA_UBER_TRAY_VOLUME_LEVELS 6127 +#define IDR_AURA_UBER_TRAY_VOLUME_MUTE 6128 +#define IDR_AURA_UBER_TRAY_WIFI_DISABLED 6129 +#define IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER 6130 +#define IDR_AURA_UBER_TRAY_WIFI_ENABLED 6131 +#define IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER 6132 +#define IDR_AURA_UBER_TRAY_NOTIFY_CLOSE 6133 +#define IDR_AURA_WINDOW_BUTTON_SEPARATOR 6134 +#define IDR_AURA_WINDOW_FULLSCREEN_CLOSE 6135 +#define IDR_AURA_WINDOW_FULLSCREEN_CLOSE_H 6136 +#define IDR_AURA_WINDOW_FULLSCREEN_CLOSE_P 6137 +#define IDR_AURA_WINDOW_FULLSCREEN_RESTORE 6138 +#define IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H 6139 +#define IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P 6140 +#define IDR_AURA_WINDOW_FULLSCREEN_SHADOW 6147 +#define IDR_AURA_WINDOW_HEADER_BASE_ACTIVE 6148 +#define IDR_AURA_WINDOW_HEADER_BASE_INACTIVE 6149 +#define IDR_AURA_WINDOW_HEADER_BASE_INCOGNITO_ACTIVE 6150 +#define IDR_AURA_WINDOW_HEADER_BASE_INCOGNITO_INACTIVE 6151 +#define IDR_AURA_WINDOW_HEADER_SHADE_BOTTOM 6152 +#define IDR_AURA_WINDOW_HEADER_SHADE_BOTTOM_LEFT 6153 +#define IDR_AURA_WINDOW_HEADER_SHADE_BOTTOM_RIGHT 6154 +#define IDR_AURA_WINDOW_HEADER_SHADE_LEFT 6155 +#define IDR_AURA_WINDOW_HEADER_SHADE_MIDDLE 6156 +#define IDR_AURA_WINDOW_HEADER_SHADE_RIGHT 6157 +#define IDR_AURA_WINDOW_HEADER_SHADE_TOP 6158 +#define IDR_AURA_WINDOW_HEADER_SHADE_TOP_LEFT 6159 +#define IDR_AURA_WINDOW_HEADER_SHADE_TOP_RIGHT 6160 +#define IDR_AURA_WINDOW_CLOSE 6161 +#define IDR_AURA_WINDOW_CLOSE_H 6162 +#define IDR_AURA_WINDOW_CLOSE_P 6163 +#define IDR_AURA_WINDOW_MAXIMIZED_CLOSE 6164 +#define IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H 6165 +#define IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P 6166 +#define IDR_AURA_WINDOW_MAXIMIZE 6167 +#define IDR_AURA_WINDOW_MAXIMIZE_H 6168 +#define IDR_AURA_WINDOW_MAXIMIZE_P 6169 +#define IDR_AURA_WINDOW_MAXIMIZED_RESTORE 6170 +#define IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H 6171 +#define IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P 6172 +#define IDR_AURA_WINDOW_POSITION_LEFT 6185 +#define IDR_AURA_WINDOW_POSITION_LEFT_H 6186 +#define IDR_AURA_WINDOW_POSITION_LEFT_P 6187 +#define IDR_AURA_WINDOW_POSITION_MIDDLE 6188 +#define IDR_AURA_WINDOW_POSITION_MIDDLE_H 6189 +#define IDR_AURA_WINDOW_POSITION_MIDDLE_P 6190 +#define IDR_AURA_WINDOW_POSITION_RIGHT 6191 +#define IDR_AURA_WINDOW_POSITION_RIGHT_H 6192 +#define IDR_AURA_WINDOW_POSITION_RIGHT_P 6193 +#define IDR_AURA_WINDOW_POSITION_LEFT_RESTORE 6194 +#define IDR_AURA_WINDOW_POSITION_LEFT_RESTORE_H 6195 +#define IDR_AURA_WINDOW_POSITION_LEFT_RESTORE_P 6196 +#define IDR_AURA_WINDOW_POSITION_RIGHT_RESTORE 6197 +#define IDR_AURA_WINDOW_POSITION_RIGHT_RESTORE_H 6198 +#define IDR_AURA_WINDOW_POSITION_RIGHT_RESTORE_P 6199 +#define IDR_AURA_WINDOW_CLOSE_ICON 6200 +#define IDR_AURA_WINDOW_ZOOM_ICON 6201 +#define IDR_BROWSER_ACTION_BADGE_CENTER 6202 +#define IDR_BROWSER_ACTION_BADGE_LEFT 6203 +#define IDR_BROWSER_ACTION_BADGE_RIGHT 6204 +#define IDR_BUBBLE_B 6205 +#define IDR_BUBBLE_BL 6206 +#define IDR_BUBBLE_BR 6207 +#define IDR_BUBBLE_B_ARROW 6208 +#define IDR_BUBBLE_L 6209 +#define IDR_BUBBLE_L_ARROW 6210 +#define IDR_BUBBLE_R 6211 +#define IDR_BUBBLE_R_ARROW 6212 +#define IDR_BUBBLE_SHADOW_B 6213 +#define IDR_BUBBLE_SHADOW_BL 6214 +#define IDR_BUBBLE_SHADOW_BR 6215 +#define IDR_BUBBLE_SHADOW_L 6216 +#define IDR_BUBBLE_SHADOW_R 6217 +#define IDR_BUBBLE_SHADOW_T 6218 +#define IDR_BUBBLE_SHADOW_TL 6219 +#define IDR_BUBBLE_SHADOW_TR 6220 +#define IDR_BUBBLE_T 6221 +#define IDR_BUBBLE_TL 6222 +#define IDR_BUBBLE_TR 6223 +#define IDR_BUBBLE_T_ARROW 6224 +#define IDR_CHECKBOX_DISABLED_INDETERMINATE 6225 +#define IDR_CHECKBOX_DISABLED_OFF 6226 +#define IDR_CHECKBOX_DISABLED_ON 6227 +#define IDR_CHECKBOX_INDETERMINATE 6228 +#define IDR_CHECKBOX_OFF 6229 +#define IDR_CHECKBOX_ON 6230 +#define IDR_CHECKMARK 6237 +#define IDR_CLOSE 6238 +#define IDR_CLOSE_BAR 6240 +#define IDR_CLOSE_BAR_H 6241 +#define IDR_CLOSE_BAR_MASK 6242 +#define IDR_CLOSE_BAR_P 6243 +#define IDR_CLOSE_H 6244 +#define IDR_CLOSE_P 6245 +#define IDR_CLOSE_SA 6248 +#define IDR_CLOSE_SA_H 6249 +#define IDR_CLOSE_SA_P 6250 +#define IDR_CONTENT_BOTTOM_CENTER 6251 +#define IDR_CONTENT_BOTTOM_LEFT_CORNER 6252 +#define IDR_CONTENT_BOTTOM_RIGHT_CORNER 6253 +#define IDR_CONTENT_LEFT_SIDE 6254 +#define IDR_CONTENT_RIGHT_SIDE 6255 +#define IDR_DEFAULT_FAVICON 6256 +#define IDR_DEFAULT_LARGE_FAVICON 6257 +#define IDR_FOLDER_CLOSED 6258 +#define IDR_FOLDER_CLOSED_RTL 6259 +#define IDR_FOLDER_OPEN 6260 +#define IDR_FOLDER_OPEN_RTL 6261 +#define IDR_FRAME 6262 +#define IDR_FRAME_APP_PANEL 6263 +#define IDR_FRAME_INACTIVE 6264 +#define IDR_MAXIMIZE 6265 +#define IDR_MAXIMIZE_H 6266 +#define IDR_MAXIMIZE_P 6267 +#define IDR_MENU_ARROW 6271 +#define IDR_MENU_CHECK 6272 +#define IDR_SLIDER_ACTIVE_LEFT 6273 +#define IDR_SLIDER_ACTIVE_RIGHT 6274 +#define IDR_SLIDER_ACTIVE_CENTER 6275 +#define IDR_SLIDER_DISABLED_LEFT 6276 +#define IDR_SLIDER_DISABLED_RIGHT 6277 +#define IDR_SLIDER_DISABLED_CENTER 6278 +#define IDR_SLIDER_PRESSED_LEFT 6279 +#define IDR_SLIDER_PRESSED_RIGHT 6280 +#define IDR_SLIDER_PRESSED_CENTER 6281 +#define IDR_SLIDER_ACTIVE_THUMB 6282 +#define IDR_SLIDER_DISABLED_THUMB 6283 +#define IDR_MENU_DROPARROW 6284 +#define IDR_MINIMIZE 6285 +#define IDR_MINIMIZE_H 6286 +#define IDR_MINIMIZE_P 6287 +#define IDR_OAK 6291 +#define IDR_PANEL_BOTTOM_LEFT_CORNER 6292 +#define IDR_PANEL_BOTTOM_RIGHT_CORNER 6293 +#define IDR_PROGRESS_BAR 6294 +#define IDR_PROGRESS_BORDER_LEFT 6295 +#define IDR_PROGRESS_BORDER_RIGHT 6296 +#define IDR_PROGRESS_VALUE 6297 +#define IDR_RADIO_DISABLED_OFF 6298 +#define IDR_RADIO_DISABLED_ON 6299 +#define IDR_RADIO_OFF 6300 +#define IDR_RADIO_ON 6301 +#define IDR_SCROLL_BASE_CORNER 6310 +#define IDR_SCROLL_BASE_CORNER_H 6311 +#define IDR_SCROLL_BASE_HORIZONTAL_CENTER 6312 +#define IDR_SCROLL_BASE_HORIZONTAL_CENTER_H 6313 +#define IDR_SCROLL_BASE_HORIZONTAL_LEFT 6314 +#define IDR_SCROLL_BASE_HORIZONTAL_LEFT_H 6315 +#define IDR_SCROLL_BASE_HORIZONTAL_RIGHT 6316 +#define IDR_SCROLL_BASE_HORIZONTAL_RIGHT_H 6317 +#define IDR_SCROLL_BASE_VERTICAL_BOTTOM 6318 +#define IDR_SCROLL_BASE_VERTICAL_BOTTOM_H 6319 +#define IDR_SCROLL_BASE_VERTICAL_CENTER 6320 +#define IDR_SCROLL_BASE_VERTICAL_CENTER_H 6321 +#define IDR_SCROLL_BASE_VERTICAL_TOP 6322 +#define IDR_SCROLL_BASE_VERTICAL_TOP_H 6323 +#define IDR_SCROLL_THUMB_HORIZONTAL_CENTER 6324 +#define IDR_SCROLL_THUMB_HORIZONTAL_CENTER_H 6325 +#define IDR_SCROLL_THUMB_HORIZONTAL_CENTER_P 6326 +#define IDR_SCROLL_THUMB_HORIZONTAL_LEFT 6327 +#define IDR_SCROLL_THUMB_HORIZONTAL_LEFT_H 6328 +#define IDR_SCROLL_THUMB_HORIZONTAL_LEFT_P 6329 +#define IDR_SCROLL_THUMB_HORIZONTAL_RIGHT 6330 +#define IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_H 6331 +#define IDR_SCROLL_THUMB_HORIZONTAL_RIGHT_P 6332 +#define IDR_SCROLL_THUMB_VERTICAL_BOTTOM 6333 +#define IDR_SCROLL_THUMB_VERTICAL_BOTTOM_H 6334 +#define IDR_SCROLL_THUMB_VERTICAL_BOTTOM_P 6335 +#define IDR_SCROLL_THUMB_VERTICAL_CENTER 6336 +#define IDR_SCROLL_THUMB_VERTICAL_CENTER_H 6337 +#define IDR_SCROLL_THUMB_VERTICAL_CENTER_P 6338 +#define IDR_SCROLL_THUMB_VERTICAL_TOP 6339 +#define IDR_SCROLL_THUMB_VERTICAL_TOP_H 6340 +#define IDR_SCROLL_THUMB_VERTICAL_TOP_P 6341 +#define IDR_RESTORE 6342 +#define IDR_RESTORE_H 6343 +#define IDR_RESTORE_P 6344 +#define IDR_TEXTBUTTON_HOVER_BOTTOM 6348 +#define IDR_TEXTBUTTON_HOVER_BOTTOM_LEFT 6349 +#define IDR_TEXTBUTTON_HOVER_BOTTOM_RIGHT 6350 +#define IDR_TEXTBUTTON_HOVER_CENTER 6351 +#define IDR_TEXTBUTTON_HOVER_LEFT 6352 +#define IDR_TEXTBUTTON_HOVER_RIGHT 6353 +#define IDR_TEXTBUTTON_HOVER_TOP 6354 +#define IDR_TEXTBUTTON_HOVER_TOP_LEFT 6355 +#define IDR_TEXTBUTTON_HOVER_TOP_RIGHT 6356 +#define IDR_TEXTBUTTON_PRESSED_BOTTOM 6357 +#define IDR_TEXTBUTTON_PRESSED_BOTTOM_LEFT 6358 +#define IDR_TEXTBUTTON_PRESSED_BOTTOM_RIGHT 6359 +#define IDR_TEXTBUTTON_PRESSED_CENTER 6360 +#define IDR_TEXTBUTTON_PRESSED_LEFT 6361 +#define IDR_TEXTBUTTON_PRESSED_RIGHT 6362 +#define IDR_TEXTBUTTON_PRESSED_TOP 6363 +#define IDR_TEXTBUTTON_PRESSED_TOP_LEFT 6364 +#define IDR_TEXTBUTTON_PRESSED_TOP_RIGHT 6365 +#define IDR_THROBBER 6366 +#define IDR_WINDOW_BOTTOM_CENTER 6367 +#define IDR_WINDOW_BOTTOM_LEFT_CORNER 6368 +#define IDR_WINDOW_BOTTOM_RIGHT_CORNER 6369 +#define IDR_WINDOW_LEFT_SIDE 6370 +#define IDR_WINDOW_RIGHT_SIDE 6371 +#define IDR_WINDOW_TOP_CENTER 6372 +#define IDR_WINDOW_TOP_LEFT_CORNER 6373 +#define IDR_WINDOW_TOP_RIGHT_CORNER 6374 // --------------------------------------------------------------------------- // From webkit_chromium_resources.h: -#define IDR_AUDIO_SPATIALIZATION_T000_P000 7000 -#define IDR_AUDIO_SPATIALIZATION_T000_P015 7001 -#define IDR_AUDIO_SPATIALIZATION_T000_P030 7002 -#define IDR_AUDIO_SPATIALIZATION_T000_P045 7003 -#define IDR_AUDIO_SPATIALIZATION_T000_P060 7004 -#define IDR_AUDIO_SPATIALIZATION_T000_P075 7005 -#define IDR_AUDIO_SPATIALIZATION_T000_P090 7006 -#define IDR_AUDIO_SPATIALIZATION_T000_P315 7007 -#define IDR_AUDIO_SPATIALIZATION_T000_P330 7008 -#define IDR_AUDIO_SPATIALIZATION_T000_P345 7009 -#define IDR_AUDIO_SPATIALIZATION_T015_P000 7010 -#define IDR_AUDIO_SPATIALIZATION_T015_P015 7011 -#define IDR_AUDIO_SPATIALIZATION_T015_P030 7012 -#define IDR_AUDIO_SPATIALIZATION_T015_P045 7013 -#define IDR_AUDIO_SPATIALIZATION_T015_P060 7014 -#define IDR_AUDIO_SPATIALIZATION_T015_P075 7015 -#define IDR_AUDIO_SPATIALIZATION_T015_P090 7016 -#define IDR_AUDIO_SPATIALIZATION_T015_P315 7017 -#define IDR_AUDIO_SPATIALIZATION_T015_P330 7018 -#define IDR_AUDIO_SPATIALIZATION_T015_P345 7019 -#define IDR_AUDIO_SPATIALIZATION_T030_P000 7020 -#define IDR_AUDIO_SPATIALIZATION_T030_P015 7021 -#define IDR_AUDIO_SPATIALIZATION_T030_P030 7022 -#define IDR_AUDIO_SPATIALIZATION_T030_P045 7023 -#define IDR_AUDIO_SPATIALIZATION_T030_P060 7024 -#define IDR_AUDIO_SPATIALIZATION_T030_P075 7025 -#define IDR_AUDIO_SPATIALIZATION_T030_P090 7026 -#define IDR_AUDIO_SPATIALIZATION_T030_P315 7027 -#define IDR_AUDIO_SPATIALIZATION_T030_P330 7028 -#define IDR_AUDIO_SPATIALIZATION_T030_P345 7029 -#define IDR_AUDIO_SPATIALIZATION_T045_P000 7030 -#define IDR_AUDIO_SPATIALIZATION_T045_P015 7031 -#define IDR_AUDIO_SPATIALIZATION_T045_P030 7032 -#define IDR_AUDIO_SPATIALIZATION_T045_P045 7033 -#define IDR_AUDIO_SPATIALIZATION_T045_P060 7034 -#define IDR_AUDIO_SPATIALIZATION_T045_P075 7035 -#define IDR_AUDIO_SPATIALIZATION_T045_P090 7036 -#define IDR_AUDIO_SPATIALIZATION_T045_P315 7037 -#define IDR_AUDIO_SPATIALIZATION_T045_P330 7038 -#define IDR_AUDIO_SPATIALIZATION_T045_P345 7039 -#define IDR_AUDIO_SPATIALIZATION_T060_P000 7040 -#define IDR_AUDIO_SPATIALIZATION_T060_P015 7041 -#define IDR_AUDIO_SPATIALIZATION_T060_P030 7042 -#define IDR_AUDIO_SPATIALIZATION_T060_P045 7043 -#define IDR_AUDIO_SPATIALIZATION_T060_P060 7044 -#define IDR_AUDIO_SPATIALIZATION_T060_P075 7045 -#define IDR_AUDIO_SPATIALIZATION_T060_P090 7046 -#define IDR_AUDIO_SPATIALIZATION_T060_P315 7047 -#define IDR_AUDIO_SPATIALIZATION_T060_P330 7048 -#define IDR_AUDIO_SPATIALIZATION_T060_P345 7049 -#define IDR_AUDIO_SPATIALIZATION_T075_P000 7050 -#define IDR_AUDIO_SPATIALIZATION_T075_P015 7051 -#define IDR_AUDIO_SPATIALIZATION_T075_P030 7052 -#define IDR_AUDIO_SPATIALIZATION_T075_P045 7053 -#define IDR_AUDIO_SPATIALIZATION_T075_P060 7054 -#define IDR_AUDIO_SPATIALIZATION_T075_P075 7055 -#define IDR_AUDIO_SPATIALIZATION_T075_P090 7056 -#define IDR_AUDIO_SPATIALIZATION_T075_P315 7057 -#define IDR_AUDIO_SPATIALIZATION_T075_P330 7058 -#define IDR_AUDIO_SPATIALIZATION_T075_P345 7059 -#define IDR_AUDIO_SPATIALIZATION_T090_P000 7060 -#define IDR_AUDIO_SPATIALIZATION_T090_P015 7061 -#define IDR_AUDIO_SPATIALIZATION_T090_P030 7062 -#define IDR_AUDIO_SPATIALIZATION_T090_P045 7063 -#define IDR_AUDIO_SPATIALIZATION_T090_P060 7064 -#define IDR_AUDIO_SPATIALIZATION_T090_P075 7065 -#define IDR_AUDIO_SPATIALIZATION_T090_P090 7066 -#define IDR_AUDIO_SPATIALIZATION_T090_P315 7067 -#define IDR_AUDIO_SPATIALIZATION_T090_P330 7068 -#define IDR_AUDIO_SPATIALIZATION_T090_P345 7069 -#define IDR_AUDIO_SPATIALIZATION_T105_P000 7070 -#define IDR_AUDIO_SPATIALIZATION_T105_P015 7071 -#define IDR_AUDIO_SPATIALIZATION_T105_P030 7072 -#define IDR_AUDIO_SPATIALIZATION_T105_P045 7073 -#define IDR_AUDIO_SPATIALIZATION_T105_P060 7074 -#define IDR_AUDIO_SPATIALIZATION_T105_P075 7075 -#define IDR_AUDIO_SPATIALIZATION_T105_P090 7076 -#define IDR_AUDIO_SPATIALIZATION_T105_P315 7077 -#define IDR_AUDIO_SPATIALIZATION_T105_P330 7078 -#define IDR_AUDIO_SPATIALIZATION_T105_P345 7079 -#define IDR_AUDIO_SPATIALIZATION_T120_P000 7080 -#define IDR_AUDIO_SPATIALIZATION_T120_P015 7081 -#define IDR_AUDIO_SPATIALIZATION_T120_P030 7082 -#define IDR_AUDIO_SPATIALIZATION_T120_P045 7083 -#define IDR_AUDIO_SPATIALIZATION_T120_P060 7084 -#define IDR_AUDIO_SPATIALIZATION_T120_P075 7085 -#define IDR_AUDIO_SPATIALIZATION_T120_P090 7086 -#define IDR_AUDIO_SPATIALIZATION_T120_P315 7087 -#define IDR_AUDIO_SPATIALIZATION_T120_P330 7088 -#define IDR_AUDIO_SPATIALIZATION_T120_P345 7089 -#define IDR_AUDIO_SPATIALIZATION_T135_P000 7090 -#define IDR_AUDIO_SPATIALIZATION_T135_P015 7091 -#define IDR_AUDIO_SPATIALIZATION_T135_P030 7092 -#define IDR_AUDIO_SPATIALIZATION_T135_P045 7093 -#define IDR_AUDIO_SPATIALIZATION_T135_P060 7094 -#define IDR_AUDIO_SPATIALIZATION_T135_P075 7095 -#define IDR_AUDIO_SPATIALIZATION_T135_P090 7096 -#define IDR_AUDIO_SPATIALIZATION_T135_P315 7097 -#define IDR_AUDIO_SPATIALIZATION_T135_P330 7098 -#define IDR_AUDIO_SPATIALIZATION_T135_P345 7099 -#define IDR_AUDIO_SPATIALIZATION_T150_P000 7100 -#define IDR_AUDIO_SPATIALIZATION_T150_P015 7101 -#define IDR_AUDIO_SPATIALIZATION_T150_P030 7102 -#define IDR_AUDIO_SPATIALIZATION_T150_P045 7103 -#define IDR_AUDIO_SPATIALIZATION_T150_P060 7104 -#define IDR_AUDIO_SPATIALIZATION_T150_P075 7105 -#define IDR_AUDIO_SPATIALIZATION_T150_P090 7106 -#define IDR_AUDIO_SPATIALIZATION_T150_P315 7107 -#define IDR_AUDIO_SPATIALIZATION_T150_P330 7108 -#define IDR_AUDIO_SPATIALIZATION_T150_P345 7109 -#define IDR_AUDIO_SPATIALIZATION_T165_P000 7110 -#define IDR_AUDIO_SPATIALIZATION_T165_P015 7111 -#define IDR_AUDIO_SPATIALIZATION_T165_P030 7112 -#define IDR_AUDIO_SPATIALIZATION_T165_P045 7113 -#define IDR_AUDIO_SPATIALIZATION_T165_P060 7114 -#define IDR_AUDIO_SPATIALIZATION_T165_P075 7115 -#define IDR_AUDIO_SPATIALIZATION_T165_P090 7116 -#define IDR_AUDIO_SPATIALIZATION_T165_P315 7117 -#define IDR_AUDIO_SPATIALIZATION_T165_P330 7118 -#define IDR_AUDIO_SPATIALIZATION_T165_P345 7119 -#define IDR_AUDIO_SPATIALIZATION_T180_P000 7120 -#define IDR_AUDIO_SPATIALIZATION_T180_P015 7121 -#define IDR_AUDIO_SPATIALIZATION_T180_P030 7122 -#define IDR_AUDIO_SPATIALIZATION_T180_P045 7123 -#define IDR_AUDIO_SPATIALIZATION_T180_P060 7124 -#define IDR_AUDIO_SPATIALIZATION_T180_P075 7125 -#define IDR_AUDIO_SPATIALIZATION_T180_P090 7126 -#define IDR_AUDIO_SPATIALIZATION_T180_P315 7127 -#define IDR_AUDIO_SPATIALIZATION_T180_P330 7128 -#define IDR_AUDIO_SPATIALIZATION_T180_P345 7129 -#define IDR_AUDIO_SPATIALIZATION_T195_P000 7130 -#define IDR_AUDIO_SPATIALIZATION_T195_P015 7131 -#define IDR_AUDIO_SPATIALIZATION_T195_P030 7132 -#define IDR_AUDIO_SPATIALIZATION_T195_P045 7133 -#define IDR_AUDIO_SPATIALIZATION_T195_P060 7134 -#define IDR_AUDIO_SPATIALIZATION_T195_P075 7135 -#define IDR_AUDIO_SPATIALIZATION_T195_P090 7136 -#define IDR_AUDIO_SPATIALIZATION_T195_P315 7137 -#define IDR_AUDIO_SPATIALIZATION_T195_P330 7138 -#define IDR_AUDIO_SPATIALIZATION_T195_P345 7139 -#define IDR_AUDIO_SPATIALIZATION_T210_P000 7140 -#define IDR_AUDIO_SPATIALIZATION_T210_P015 7141 -#define IDR_AUDIO_SPATIALIZATION_T210_P030 7142 -#define IDR_AUDIO_SPATIALIZATION_T210_P045 7143 -#define IDR_AUDIO_SPATIALIZATION_T210_P060 7144 -#define IDR_AUDIO_SPATIALIZATION_T210_P075 7145 -#define IDR_AUDIO_SPATIALIZATION_T210_P090 7146 -#define IDR_AUDIO_SPATIALIZATION_T210_P315 7147 -#define IDR_AUDIO_SPATIALIZATION_T210_P330 7148 -#define IDR_AUDIO_SPATIALIZATION_T210_P345 7149 -#define IDR_AUDIO_SPATIALIZATION_T225_P000 7150 -#define IDR_AUDIO_SPATIALIZATION_T225_P015 7151 -#define IDR_AUDIO_SPATIALIZATION_T225_P030 7152 -#define IDR_AUDIO_SPATIALIZATION_T225_P045 7153 -#define IDR_AUDIO_SPATIALIZATION_T225_P060 7154 -#define IDR_AUDIO_SPATIALIZATION_T225_P075 7155 -#define IDR_AUDIO_SPATIALIZATION_T225_P090 7156 -#define IDR_AUDIO_SPATIALIZATION_T225_P315 7157 -#define IDR_AUDIO_SPATIALIZATION_T225_P330 7158 -#define IDR_AUDIO_SPATIALIZATION_T225_P345 7159 -#define IDR_AUDIO_SPATIALIZATION_T240_P000 7160 -#define IDR_AUDIO_SPATIALIZATION_T240_P015 7161 -#define IDR_AUDIO_SPATIALIZATION_T240_P030 7162 -#define IDR_AUDIO_SPATIALIZATION_T240_P045 7163 -#define IDR_AUDIO_SPATIALIZATION_T240_P060 7164 -#define IDR_AUDIO_SPATIALIZATION_T240_P075 7165 -#define IDR_AUDIO_SPATIALIZATION_T240_P090 7166 -#define IDR_AUDIO_SPATIALIZATION_T240_P315 7167 -#define IDR_AUDIO_SPATIALIZATION_T240_P330 7168 -#define IDR_AUDIO_SPATIALIZATION_T240_P345 7169 -#define IDR_AUDIO_SPATIALIZATION_T255_P000 7170 -#define IDR_AUDIO_SPATIALIZATION_T255_P015 7171 -#define IDR_AUDIO_SPATIALIZATION_T255_P030 7172 -#define IDR_AUDIO_SPATIALIZATION_T255_P045 7173 -#define IDR_AUDIO_SPATIALIZATION_T255_P060 7174 -#define IDR_AUDIO_SPATIALIZATION_T255_P075 7175 -#define IDR_AUDIO_SPATIALIZATION_T255_P090 7176 -#define IDR_AUDIO_SPATIALIZATION_T255_P315 7177 -#define IDR_AUDIO_SPATIALIZATION_T255_P330 7178 -#define IDR_AUDIO_SPATIALIZATION_T255_P345 7179 -#define IDR_AUDIO_SPATIALIZATION_T270_P000 7180 -#define IDR_AUDIO_SPATIALIZATION_T270_P015 7181 -#define IDR_AUDIO_SPATIALIZATION_T270_P030 7182 -#define IDR_AUDIO_SPATIALIZATION_T270_P045 7183 -#define IDR_AUDIO_SPATIALIZATION_T270_P060 7184 -#define IDR_AUDIO_SPATIALIZATION_T270_P075 7185 -#define IDR_AUDIO_SPATIALIZATION_T270_P090 7186 -#define IDR_AUDIO_SPATIALIZATION_T270_P315 7187 -#define IDR_AUDIO_SPATIALIZATION_T270_P330 7188 -#define IDR_AUDIO_SPATIALIZATION_T270_P345 7189 -#define IDR_AUDIO_SPATIALIZATION_T285_P000 7190 -#define IDR_AUDIO_SPATIALIZATION_T285_P015 7191 -#define IDR_AUDIO_SPATIALIZATION_T285_P030 7192 -#define IDR_AUDIO_SPATIALIZATION_T285_P045 7193 -#define IDR_AUDIO_SPATIALIZATION_T285_P060 7194 -#define IDR_AUDIO_SPATIALIZATION_T285_P075 7195 -#define IDR_AUDIO_SPATIALIZATION_T285_P090 7196 -#define IDR_AUDIO_SPATIALIZATION_T285_P315 7197 -#define IDR_AUDIO_SPATIALIZATION_T285_P330 7198 -#define IDR_AUDIO_SPATIALIZATION_T285_P345 7199 -#define IDR_AUDIO_SPATIALIZATION_T300_P000 7200 -#define IDR_AUDIO_SPATIALIZATION_T300_P015 7201 -#define IDR_AUDIO_SPATIALIZATION_T300_P030 7202 -#define IDR_AUDIO_SPATIALIZATION_T300_P045 7203 -#define IDR_AUDIO_SPATIALIZATION_T300_P060 7204 -#define IDR_AUDIO_SPATIALIZATION_T300_P075 7205 -#define IDR_AUDIO_SPATIALIZATION_T300_P090 7206 -#define IDR_AUDIO_SPATIALIZATION_T300_P315 7207 -#define IDR_AUDIO_SPATIALIZATION_T300_P330 7208 -#define IDR_AUDIO_SPATIALIZATION_T300_P345 7209 -#define IDR_AUDIO_SPATIALIZATION_T315_P000 7210 -#define IDR_AUDIO_SPATIALIZATION_T315_P015 7211 -#define IDR_AUDIO_SPATIALIZATION_T315_P030 7212 -#define IDR_AUDIO_SPATIALIZATION_T315_P045 7213 -#define IDR_AUDIO_SPATIALIZATION_T315_P060 7214 -#define IDR_AUDIO_SPATIALIZATION_T315_P075 7215 -#define IDR_AUDIO_SPATIALIZATION_T315_P090 7216 -#define IDR_AUDIO_SPATIALIZATION_T315_P315 7217 -#define IDR_AUDIO_SPATIALIZATION_T315_P330 7218 -#define IDR_AUDIO_SPATIALIZATION_T315_P345 7219 -#define IDR_AUDIO_SPATIALIZATION_T330_P000 7220 -#define IDR_AUDIO_SPATIALIZATION_T330_P015 7221 -#define IDR_AUDIO_SPATIALIZATION_T330_P030 7222 -#define IDR_AUDIO_SPATIALIZATION_T330_P045 7223 -#define IDR_AUDIO_SPATIALIZATION_T330_P060 7224 -#define IDR_AUDIO_SPATIALIZATION_T330_P075 7225 -#define IDR_AUDIO_SPATIALIZATION_T330_P090 7226 -#define IDR_AUDIO_SPATIALIZATION_T330_P315 7227 -#define IDR_AUDIO_SPATIALIZATION_T330_P330 7228 -#define IDR_AUDIO_SPATIALIZATION_T330_P345 7229 -#define IDR_AUDIO_SPATIALIZATION_T345_P000 7230 -#define IDR_AUDIO_SPATIALIZATION_T345_P015 7231 -#define IDR_AUDIO_SPATIALIZATION_T345_P030 7232 -#define IDR_AUDIO_SPATIALIZATION_T345_P045 7233 -#define IDR_AUDIO_SPATIALIZATION_T345_P060 7234 -#define IDR_AUDIO_SPATIALIZATION_T345_P075 7235 -#define IDR_AUDIO_SPATIALIZATION_T345_P090 7236 -#define IDR_AUDIO_SPATIALIZATION_T345_P315 7237 -#define IDR_AUDIO_SPATIALIZATION_T345_P330 7238 -#define IDR_AUDIO_SPATIALIZATION_T345_P345 7239 +#define IDR_AUDIO_SPATIALIZATION_T000_P000 8500 +#define IDR_AUDIO_SPATIALIZATION_T000_P015 8501 +#define IDR_AUDIO_SPATIALIZATION_T000_P030 8502 +#define IDR_AUDIO_SPATIALIZATION_T000_P045 8503 +#define IDR_AUDIO_SPATIALIZATION_T000_P060 8504 +#define IDR_AUDIO_SPATIALIZATION_T000_P075 8505 +#define IDR_AUDIO_SPATIALIZATION_T000_P090 8506 +#define IDR_AUDIO_SPATIALIZATION_T000_P315 8507 +#define IDR_AUDIO_SPATIALIZATION_T000_P330 8508 +#define IDR_AUDIO_SPATIALIZATION_T000_P345 8509 +#define IDR_AUDIO_SPATIALIZATION_T015_P000 8510 +#define IDR_AUDIO_SPATIALIZATION_T015_P015 8511 +#define IDR_AUDIO_SPATIALIZATION_T015_P030 8512 +#define IDR_AUDIO_SPATIALIZATION_T015_P045 8513 +#define IDR_AUDIO_SPATIALIZATION_T015_P060 8514 +#define IDR_AUDIO_SPATIALIZATION_T015_P075 8515 +#define IDR_AUDIO_SPATIALIZATION_T015_P090 8516 +#define IDR_AUDIO_SPATIALIZATION_T015_P315 8517 +#define IDR_AUDIO_SPATIALIZATION_T015_P330 8518 +#define IDR_AUDIO_SPATIALIZATION_T015_P345 8519 +#define IDR_AUDIO_SPATIALIZATION_T030_P000 8520 +#define IDR_AUDIO_SPATIALIZATION_T030_P015 8521 +#define IDR_AUDIO_SPATIALIZATION_T030_P030 8522 +#define IDR_AUDIO_SPATIALIZATION_T030_P045 8523 +#define IDR_AUDIO_SPATIALIZATION_T030_P060 8524 +#define IDR_AUDIO_SPATIALIZATION_T030_P075 8525 +#define IDR_AUDIO_SPATIALIZATION_T030_P090 8526 +#define IDR_AUDIO_SPATIALIZATION_T030_P315 8527 +#define IDR_AUDIO_SPATIALIZATION_T030_P330 8528 +#define IDR_AUDIO_SPATIALIZATION_T030_P345 8529 +#define IDR_AUDIO_SPATIALIZATION_T045_P000 8530 +#define IDR_AUDIO_SPATIALIZATION_T045_P015 8531 +#define IDR_AUDIO_SPATIALIZATION_T045_P030 8532 +#define IDR_AUDIO_SPATIALIZATION_T045_P045 8533 +#define IDR_AUDIO_SPATIALIZATION_T045_P060 8534 +#define IDR_AUDIO_SPATIALIZATION_T045_P075 8535 +#define IDR_AUDIO_SPATIALIZATION_T045_P090 8536 +#define IDR_AUDIO_SPATIALIZATION_T045_P315 8537 +#define IDR_AUDIO_SPATIALIZATION_T045_P330 8538 +#define IDR_AUDIO_SPATIALIZATION_T045_P345 8539 +#define IDR_AUDIO_SPATIALIZATION_T060_P000 8540 +#define IDR_AUDIO_SPATIALIZATION_T060_P015 8541 +#define IDR_AUDIO_SPATIALIZATION_T060_P030 8542 +#define IDR_AUDIO_SPATIALIZATION_T060_P045 8543 +#define IDR_AUDIO_SPATIALIZATION_T060_P060 8544 +#define IDR_AUDIO_SPATIALIZATION_T060_P075 8545 +#define IDR_AUDIO_SPATIALIZATION_T060_P090 8546 +#define IDR_AUDIO_SPATIALIZATION_T060_P315 8547 +#define IDR_AUDIO_SPATIALIZATION_T060_P330 8548 +#define IDR_AUDIO_SPATIALIZATION_T060_P345 8549 +#define IDR_AUDIO_SPATIALIZATION_T075_P000 8550 +#define IDR_AUDIO_SPATIALIZATION_T075_P015 8551 +#define IDR_AUDIO_SPATIALIZATION_T075_P030 8552 +#define IDR_AUDIO_SPATIALIZATION_T075_P045 8553 +#define IDR_AUDIO_SPATIALIZATION_T075_P060 8554 +#define IDR_AUDIO_SPATIALIZATION_T075_P075 8555 +#define IDR_AUDIO_SPATIALIZATION_T075_P090 8556 +#define IDR_AUDIO_SPATIALIZATION_T075_P315 8557 +#define IDR_AUDIO_SPATIALIZATION_T075_P330 8558 +#define IDR_AUDIO_SPATIALIZATION_T075_P345 8559 +#define IDR_AUDIO_SPATIALIZATION_T090_P000 8560 +#define IDR_AUDIO_SPATIALIZATION_T090_P015 8561 +#define IDR_AUDIO_SPATIALIZATION_T090_P030 8562 +#define IDR_AUDIO_SPATIALIZATION_T090_P045 8563 +#define IDR_AUDIO_SPATIALIZATION_T090_P060 8564 +#define IDR_AUDIO_SPATIALIZATION_T090_P075 8565 +#define IDR_AUDIO_SPATIALIZATION_T090_P090 8566 +#define IDR_AUDIO_SPATIALIZATION_T090_P315 8567 +#define IDR_AUDIO_SPATIALIZATION_T090_P330 8568 +#define IDR_AUDIO_SPATIALIZATION_T090_P345 8569 +#define IDR_AUDIO_SPATIALIZATION_T105_P000 8570 +#define IDR_AUDIO_SPATIALIZATION_T105_P015 8571 +#define IDR_AUDIO_SPATIALIZATION_T105_P030 8572 +#define IDR_AUDIO_SPATIALIZATION_T105_P045 8573 +#define IDR_AUDIO_SPATIALIZATION_T105_P060 8574 +#define IDR_AUDIO_SPATIALIZATION_T105_P075 8575 +#define IDR_AUDIO_SPATIALIZATION_T105_P090 8576 +#define IDR_AUDIO_SPATIALIZATION_T105_P315 8577 +#define IDR_AUDIO_SPATIALIZATION_T105_P330 8578 +#define IDR_AUDIO_SPATIALIZATION_T105_P345 8579 +#define IDR_AUDIO_SPATIALIZATION_T120_P000 8580 +#define IDR_AUDIO_SPATIALIZATION_T120_P015 8581 +#define IDR_AUDIO_SPATIALIZATION_T120_P030 8582 +#define IDR_AUDIO_SPATIALIZATION_T120_P045 8583 +#define IDR_AUDIO_SPATIALIZATION_T120_P060 8584 +#define IDR_AUDIO_SPATIALIZATION_T120_P075 8585 +#define IDR_AUDIO_SPATIALIZATION_T120_P090 8586 +#define IDR_AUDIO_SPATIALIZATION_T120_P315 8587 +#define IDR_AUDIO_SPATIALIZATION_T120_P330 8588 +#define IDR_AUDIO_SPATIALIZATION_T120_P345 8589 +#define IDR_AUDIO_SPATIALIZATION_T135_P000 8590 +#define IDR_AUDIO_SPATIALIZATION_T135_P015 8591 +#define IDR_AUDIO_SPATIALIZATION_T135_P030 8592 +#define IDR_AUDIO_SPATIALIZATION_T135_P045 8593 +#define IDR_AUDIO_SPATIALIZATION_T135_P060 8594 +#define IDR_AUDIO_SPATIALIZATION_T135_P075 8595 +#define IDR_AUDIO_SPATIALIZATION_T135_P090 8596 +#define IDR_AUDIO_SPATIALIZATION_T135_P315 8597 +#define IDR_AUDIO_SPATIALIZATION_T135_P330 8598 +#define IDR_AUDIO_SPATIALIZATION_T135_P345 8599 +#define IDR_AUDIO_SPATIALIZATION_T150_P000 8600 +#define IDR_AUDIO_SPATIALIZATION_T150_P015 8601 +#define IDR_AUDIO_SPATIALIZATION_T150_P030 8602 +#define IDR_AUDIO_SPATIALIZATION_T150_P045 8603 +#define IDR_AUDIO_SPATIALIZATION_T150_P060 8604 +#define IDR_AUDIO_SPATIALIZATION_T150_P075 8605 +#define IDR_AUDIO_SPATIALIZATION_T150_P090 8606 +#define IDR_AUDIO_SPATIALIZATION_T150_P315 8607 +#define IDR_AUDIO_SPATIALIZATION_T150_P330 8608 +#define IDR_AUDIO_SPATIALIZATION_T150_P345 8609 +#define IDR_AUDIO_SPATIALIZATION_T165_P000 8610 +#define IDR_AUDIO_SPATIALIZATION_T165_P015 8611 +#define IDR_AUDIO_SPATIALIZATION_T165_P030 8612 +#define IDR_AUDIO_SPATIALIZATION_T165_P045 8613 +#define IDR_AUDIO_SPATIALIZATION_T165_P060 8614 +#define IDR_AUDIO_SPATIALIZATION_T165_P075 8615 +#define IDR_AUDIO_SPATIALIZATION_T165_P090 8616 +#define IDR_AUDIO_SPATIALIZATION_T165_P315 8617 +#define IDR_AUDIO_SPATIALIZATION_T165_P330 8618 +#define IDR_AUDIO_SPATIALIZATION_T165_P345 8619 +#define IDR_AUDIO_SPATIALIZATION_T180_P000 8620 +#define IDR_AUDIO_SPATIALIZATION_T180_P015 8621 +#define IDR_AUDIO_SPATIALIZATION_T180_P030 8622 +#define IDR_AUDIO_SPATIALIZATION_T180_P045 8623 +#define IDR_AUDIO_SPATIALIZATION_T180_P060 8624 +#define IDR_AUDIO_SPATIALIZATION_T180_P075 8625 +#define IDR_AUDIO_SPATIALIZATION_T180_P090 8626 +#define IDR_AUDIO_SPATIALIZATION_T180_P315 8627 +#define IDR_AUDIO_SPATIALIZATION_T180_P330 8628 +#define IDR_AUDIO_SPATIALIZATION_T180_P345 8629 +#define IDR_AUDIO_SPATIALIZATION_T195_P000 8630 +#define IDR_AUDIO_SPATIALIZATION_T195_P015 8631 +#define IDR_AUDIO_SPATIALIZATION_T195_P030 8632 +#define IDR_AUDIO_SPATIALIZATION_T195_P045 8633 +#define IDR_AUDIO_SPATIALIZATION_T195_P060 8634 +#define IDR_AUDIO_SPATIALIZATION_T195_P075 8635 +#define IDR_AUDIO_SPATIALIZATION_T195_P090 8636 +#define IDR_AUDIO_SPATIALIZATION_T195_P315 8637 +#define IDR_AUDIO_SPATIALIZATION_T195_P330 8638 +#define IDR_AUDIO_SPATIALIZATION_T195_P345 8639 +#define IDR_AUDIO_SPATIALIZATION_T210_P000 8640 +#define IDR_AUDIO_SPATIALIZATION_T210_P015 8641 +#define IDR_AUDIO_SPATIALIZATION_T210_P030 8642 +#define IDR_AUDIO_SPATIALIZATION_T210_P045 8643 +#define IDR_AUDIO_SPATIALIZATION_T210_P060 8644 +#define IDR_AUDIO_SPATIALIZATION_T210_P075 8645 +#define IDR_AUDIO_SPATIALIZATION_T210_P090 8646 +#define IDR_AUDIO_SPATIALIZATION_T210_P315 8647 +#define IDR_AUDIO_SPATIALIZATION_T210_P330 8648 +#define IDR_AUDIO_SPATIALIZATION_T210_P345 8649 +#define IDR_AUDIO_SPATIALIZATION_T225_P000 8650 +#define IDR_AUDIO_SPATIALIZATION_T225_P015 8651 +#define IDR_AUDIO_SPATIALIZATION_T225_P030 8652 +#define IDR_AUDIO_SPATIALIZATION_T225_P045 8653 +#define IDR_AUDIO_SPATIALIZATION_T225_P060 8654 +#define IDR_AUDIO_SPATIALIZATION_T225_P075 8655 +#define IDR_AUDIO_SPATIALIZATION_T225_P090 8656 +#define IDR_AUDIO_SPATIALIZATION_T225_P315 8657 +#define IDR_AUDIO_SPATIALIZATION_T225_P330 8658 +#define IDR_AUDIO_SPATIALIZATION_T225_P345 8659 +#define IDR_AUDIO_SPATIALIZATION_T240_P000 8660 +#define IDR_AUDIO_SPATIALIZATION_T240_P015 8661 +#define IDR_AUDIO_SPATIALIZATION_T240_P030 8662 +#define IDR_AUDIO_SPATIALIZATION_T240_P045 8663 +#define IDR_AUDIO_SPATIALIZATION_T240_P060 8664 +#define IDR_AUDIO_SPATIALIZATION_T240_P075 8665 +#define IDR_AUDIO_SPATIALIZATION_T240_P090 8666 +#define IDR_AUDIO_SPATIALIZATION_T240_P315 8667 +#define IDR_AUDIO_SPATIALIZATION_T240_P330 8668 +#define IDR_AUDIO_SPATIALIZATION_T240_P345 8669 +#define IDR_AUDIO_SPATIALIZATION_T255_P000 8670 +#define IDR_AUDIO_SPATIALIZATION_T255_P015 8671 +#define IDR_AUDIO_SPATIALIZATION_T255_P030 8672 +#define IDR_AUDIO_SPATIALIZATION_T255_P045 8673 +#define IDR_AUDIO_SPATIALIZATION_T255_P060 8674 +#define IDR_AUDIO_SPATIALIZATION_T255_P075 8675 +#define IDR_AUDIO_SPATIALIZATION_T255_P090 8676 +#define IDR_AUDIO_SPATIALIZATION_T255_P315 8677 +#define IDR_AUDIO_SPATIALIZATION_T255_P330 8678 +#define IDR_AUDIO_SPATIALIZATION_T255_P345 8679 +#define IDR_AUDIO_SPATIALIZATION_T270_P000 8680 +#define IDR_AUDIO_SPATIALIZATION_T270_P015 8681 +#define IDR_AUDIO_SPATIALIZATION_T270_P030 8682 +#define IDR_AUDIO_SPATIALIZATION_T270_P045 8683 +#define IDR_AUDIO_SPATIALIZATION_T270_P060 8684 +#define IDR_AUDIO_SPATIALIZATION_T270_P075 8685 +#define IDR_AUDIO_SPATIALIZATION_T270_P090 8686 +#define IDR_AUDIO_SPATIALIZATION_T270_P315 8687 +#define IDR_AUDIO_SPATIALIZATION_T270_P330 8688 +#define IDR_AUDIO_SPATIALIZATION_T270_P345 8689 +#define IDR_AUDIO_SPATIALIZATION_T285_P000 8690 +#define IDR_AUDIO_SPATIALIZATION_T285_P015 8691 +#define IDR_AUDIO_SPATIALIZATION_T285_P030 8692 +#define IDR_AUDIO_SPATIALIZATION_T285_P045 8693 +#define IDR_AUDIO_SPATIALIZATION_T285_P060 8694 +#define IDR_AUDIO_SPATIALIZATION_T285_P075 8695 +#define IDR_AUDIO_SPATIALIZATION_T285_P090 8696 +#define IDR_AUDIO_SPATIALIZATION_T285_P315 8697 +#define IDR_AUDIO_SPATIALIZATION_T285_P330 8698 +#define IDR_AUDIO_SPATIALIZATION_T285_P345 8699 +#define IDR_AUDIO_SPATIALIZATION_T300_P000 8700 +#define IDR_AUDIO_SPATIALIZATION_T300_P015 8701 +#define IDR_AUDIO_SPATIALIZATION_T300_P030 8702 +#define IDR_AUDIO_SPATIALIZATION_T300_P045 8703 +#define IDR_AUDIO_SPATIALIZATION_T300_P060 8704 +#define IDR_AUDIO_SPATIALIZATION_T300_P075 8705 +#define IDR_AUDIO_SPATIALIZATION_T300_P090 8706 +#define IDR_AUDIO_SPATIALIZATION_T300_P315 8707 +#define IDR_AUDIO_SPATIALIZATION_T300_P330 8708 +#define IDR_AUDIO_SPATIALIZATION_T300_P345 8709 +#define IDR_AUDIO_SPATIALIZATION_T315_P000 8710 +#define IDR_AUDIO_SPATIALIZATION_T315_P015 8711 +#define IDR_AUDIO_SPATIALIZATION_T315_P030 8712 +#define IDR_AUDIO_SPATIALIZATION_T315_P045 8713 +#define IDR_AUDIO_SPATIALIZATION_T315_P060 8714 +#define IDR_AUDIO_SPATIALIZATION_T315_P075 8715 +#define IDR_AUDIO_SPATIALIZATION_T315_P090 8716 +#define IDR_AUDIO_SPATIALIZATION_T315_P315 8717 +#define IDR_AUDIO_SPATIALIZATION_T315_P330 8718 +#define IDR_AUDIO_SPATIALIZATION_T315_P345 8719 +#define IDR_AUDIO_SPATIALIZATION_T330_P000 8720 +#define IDR_AUDIO_SPATIALIZATION_T330_P015 8721 +#define IDR_AUDIO_SPATIALIZATION_T330_P030 8722 +#define IDR_AUDIO_SPATIALIZATION_T330_P045 8723 +#define IDR_AUDIO_SPATIALIZATION_T330_P060 8724 +#define IDR_AUDIO_SPATIALIZATION_T330_P075 8725 +#define IDR_AUDIO_SPATIALIZATION_T330_P090 8726 +#define IDR_AUDIO_SPATIALIZATION_T330_P315 8727 +#define IDR_AUDIO_SPATIALIZATION_T330_P330 8728 +#define IDR_AUDIO_SPATIALIZATION_T330_P345 8729 +#define IDR_AUDIO_SPATIALIZATION_T345_P000 8730 +#define IDR_AUDIO_SPATIALIZATION_T345_P015 8731 +#define IDR_AUDIO_SPATIALIZATION_T345_P030 8732 +#define IDR_AUDIO_SPATIALIZATION_T345_P045 8733 +#define IDR_AUDIO_SPATIALIZATION_T345_P060 8734 +#define IDR_AUDIO_SPATIALIZATION_T345_P075 8735 +#define IDR_AUDIO_SPATIALIZATION_T345_P090 8736 +#define IDR_AUDIO_SPATIALIZATION_T345_P315 8737 +#define IDR_AUDIO_SPATIALIZATION_T345_P330 8738 +#define IDR_AUDIO_SPATIALIZATION_T345_P345 8739 +#define IDR_ALIAS_CURSOR 8740 +#define IDR_CELL_CURSOR 8741 +#define IDR_CONTEXTMENU_CURSOR 8742 +#define IDR_COPY_CURSOR 8743 +#define IDR_EAST_RESIZE_CURSOR 8744 +#define IDR_EASTWEST_RESIZE_CURSOR 8745 +#define IDR_HELP_CURSOR 8746 +#define IDR_LINK_CURSOR 8747 +#define IDR_MISSING_IMAGE_CURSOR 8748 +#define IDR_MOVE_CURSOR 8749 +#define IDR_NODROP_CURSOR 8750 +#define IDR_NONE_CURSOR 8751 +#define IDR_NORTHEAST_RESIZE_CURSOR 8752 +#define IDR_NORTHEASTSOUTHWEST_RESIZE_CURSOR 8753 +#define IDR_NORTH_RESIZE_CURSOR 8754 +#define IDR_NORTHSOUTH_RESIZE_CURSOR 8755 +#define IDR_NORTHWEST_RESIZE_CURSOR 8756 +#define IDR_NORTHWESTSOUTHEAST_RESIZE_CURSOR 8757 +#define IDR_PROGRESS_CURSOR 8758 +#define IDR_SOUTHEAST_RESIZE_CURSOR 8759 +#define IDR_SOUTH_RESIZE_CURSOR 8760 +#define IDR_SOUTHWEST_RESIZE_CURSOR 8761 +#define IDR_VERTICALTEXT_CURSOR 8762 +#define IDR_WAIT_CURSOR 8763 +#define IDR_WEST_RESIZE_CURSOR 8764 +#define IDR_ZOOMIN_CURSOR 8765 +#define IDR_ZOOMOUT_CURSOR 8766 // --------------------------------------------------------------------------- // From webkit_resources.h: #define IDC_ALIAS 4500 -#define IDR_BROKENIMAGE 4501 -#define IDC_CELL 4502 -#define IDC_COLRESIZE 4503 -#define IDC_COPYCUR 4504 -#define IDC_CURSOR_NONE 4505 -#define IDR_INPUT_SPEECH 4506 -#define IDR_INPUT_SPEECH_RECORDING 4507 -#define IDR_INPUT_SPEECH_WAITING 4508 -#define IDR_MEDIA_FULLSCREEN_BUTTON 4509 -#define IDR_MEDIA_PAUSE_BUTTON 4510 -#define IDR_MEDIA_PLAY_BUTTON 4511 -#define IDR_MEDIA_PLAY_BUTTON_DISABLED 4512 -#define IDR_MEDIA_SOUND_DISABLED 4513 -#define IDR_MEDIA_SOUND_FULL_BUTTON 4514 -#define IDR_MEDIA_SOUND_NONE_BUTTON 4515 -#define IDR_MEDIA_SLIDER_THUMB 4516 -#define IDR_MEDIA_VOLUME_SLIDER_THUMB 4517 -#define IDR_MEDIAPLAYER_PAUSE_BUTTON 4518 -#define IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER 4519 -#define IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN 4520 -#define IDR_MEDIAPLAYER_PLAY_BUTTON 4521 -#define IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER 4522 -#define IDR_MEDIAPLAYER_PLAY_BUTTON_DOWN 4523 -#define IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED 4524 -#define IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON 4525 -#define IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER 4526 -#define IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN 4527 -#define IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON 4528 -#define IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER 4529 -#define IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN 4530 -#define IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON 4531 -#define IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER 4532 -#define IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN 4533 -#define IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON 4534 -#define IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER 4535 -#define IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN 4536 -#define IDR_MEDIAPLAYER_SOUND_DISABLED 4537 -#define IDR_MEDIAPLAYER_SLIDER_THUMB 4538 -#define IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER 4539 -#define IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN 4540 -#define IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB 4541 -#define IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER 4542 -#define IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN 4543 -#define IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED 4544 -#define IDR_MEDIAPLAYER_FULLSCREEN_BUTTON 4545 -#define IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER 4546 -#define IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN 4547 -#define IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED 4548 -#define IDR_OVERHANG_PATTERN 4549 -#define IDC_PAN_EAST 4550 -#define IDC_PAN_MIDDLE 4551 -#define IDC_PAN_NORTH 4552 -#define IDC_PAN_NORTH_EAST 4553 -#define IDC_PAN_NORTH_WEST 4554 -#define IDR_PAN_SCROLL_ICON 4555 -#define IDC_PAN_SOUTH 4556 -#define IDC_PAN_SOUTH_EAST 4557 -#define IDC_PAN_SOUTH_WEST 4558 -#define IDC_PAN_WEST 4559 -#define IDC_ROWRESIZE 4560 -#define IDR_SEARCH_CANCEL 4561 -#define IDR_SEARCH_CANCEL_PRESSED 4562 -#define IDR_SEARCH_MAGNIFIER 4563 -#define IDR_SEARCH_MAGNIFIER_RESULTS 4564 -#define IDR_TEXTAREA_RESIZER 4565 -#define IDR_TICKMARK_DASH 4566 -#define IDC_VERTICALTEXT 4567 -#define IDC_ZOOMIN 4568 -#define IDC_ZOOMOUT 4569 -#define IDR_AUTOFILL_CC_AMEX 4570 -#define IDR_AUTOFILL_CC_DINERS 4571 -#define IDR_AUTOFILL_CC_DISCOVER 4572 -#define IDR_AUTOFILL_CC_GENERIC 4573 -#define IDR_AUTOFILL_CC_JCB 4574 -#define IDR_AUTOFILL_CC_MASTERCARD 4575 -#define IDR_AUTOFILL_CC_SOLO 4576 -#define IDR_AUTOFILL_CC_VISA 4577 -#define IDR_PDF_BUTTON_FTP 4578 -#define IDR_PDF_BUTTON_FTP_HOVER 4579 -#define IDR_PDF_BUTTON_FTP_PRESSED 4580 -#define IDR_PDF_BUTTON_FTW 4581 -#define IDR_PDF_BUTTON_FTW_HOVER 4582 -#define IDR_PDF_BUTTON_FTW_PRESSED 4583 -#define IDR_PDF_BUTTON_ZOOMIN_END 4584 -#define IDR_PDF_BUTTON_ZOOMIN_END_HOVER 4585 -#define IDR_PDF_BUTTON_ZOOMIN_END_PRESSED 4586 -#define IDR_PDF_BUTTON_ZOOMIN 4587 -#define IDR_PDF_BUTTON_ZOOMIN_HOVER 4588 -#define IDR_PDF_BUTTON_ZOOMIN_PRESSED 4589 -#define IDR_PDF_BUTTON_ZOOMOUT 4590 -#define IDR_PDF_BUTTON_ZOOMOUT_HOVER 4591 -#define IDR_PDF_BUTTON_ZOOMOUT_PRESSED 4592 -#define IDR_PDF_BUTTON_SAVE 4593 -#define IDR_PDF_BUTTON_SAVE_HOVER 4594 -#define IDR_PDF_BUTTON_SAVE_PRESSED 4595 -#define IDR_PDF_BUTTON_PRINT 4596 -#define IDR_PDF_BUTTON_PRINT_HOVER 4597 -#define IDR_PDF_BUTTON_PRINT_PRESSED 4598 -#define IDR_PDF_THUMBNAIL_0 4599 -#define IDR_PDF_THUMBNAIL_1 4600 -#define IDR_PDF_THUMBNAIL_2 4601 -#define IDR_PDF_THUMBNAIL_3 4602 -#define IDR_PDF_THUMBNAIL_4 4603 -#define IDR_PDF_THUMBNAIL_5 4604 -#define IDR_PDF_THUMBNAIL_6 4605 -#define IDR_PDF_THUMBNAIL_7 4606 -#define IDR_PDF_THUMBNAIL_8 4607 -#define IDR_PDF_THUMBNAIL_9 4608 -#define IDR_PDF_THUMBNAIL_NUM_BACKGROUND 4609 -#define IDR_PDF_PROGRESS_BAR_0 4610 -#define IDR_PDF_PROGRESS_BAR_1 4611 -#define IDR_PDF_PROGRESS_BAR_2 4612 -#define IDR_PDF_PROGRESS_BAR_3 4613 -#define IDR_PDF_PROGRESS_BAR_4 4614 -#define IDR_PDF_PROGRESS_BAR_5 4615 -#define IDR_PDF_PROGRESS_BAR_6 4616 -#define IDR_PDF_PROGRESS_BAR_7 4617 -#define IDR_PDF_PROGRESS_BAR_8 4618 -#define IDR_PDF_PROGRESS_BAR_BACKGROUND 4619 -#define IDR_PDF_PAGE_INDICATOR_BACKGROUND 4620 -#define IDR_PDF_PAGE_DROPSHADOW 4621 -#define IDR_PASSWORD_GENERATION_ICON 4622 +#define IDC_CELL 4501 +#define IDC_COLRESIZE 4502 +#define IDC_COPYCUR 4503 +#define IDC_CURSOR_NONE 4504 +#define IDC_HAND_GRAB 4505 +#define IDC_HAND_GRABBING 4506 +#define IDC_PAN_EAST 4507 +#define IDC_PAN_MIDDLE 4508 +#define IDC_PAN_NORTH 4509 +#define IDC_PAN_NORTH_EAST 4510 +#define IDC_PAN_NORTH_WEST 4511 +#define IDC_PAN_SOUTH 4512 +#define IDC_PAN_SOUTH_EAST 4513 +#define IDC_PAN_SOUTH_WEST 4514 +#define IDC_PAN_WEST 4515 +#define IDC_ROWRESIZE 4516 +#define IDC_VERTICALTEXT 4517 +#define IDC_ZOOMIN 4518 +#define IDC_ZOOMOUT 4519 +#define IDR_BROKENIMAGE 4700 +#define IDR_INPUT_SPEECH 4701 +#define IDR_INPUT_SPEECH_RECORDING 4702 +#define IDR_INPUT_SPEECH_WAITING 4703 +#define IDR_MEDIA_FULLSCREEN_BUTTON 4704 +#define IDR_MEDIA_PAUSE_BUTTON 4705 +#define IDR_MEDIA_PLAY_BUTTON 4706 +#define IDR_MEDIA_PLAY_BUTTON_DISABLED 4707 +#define IDR_MEDIA_SOUND_DISABLED 4708 +#define IDR_MEDIA_SOUND_FULL_BUTTON 4709 +#define IDR_MEDIA_SOUND_NONE_BUTTON 4710 +#define IDR_MEDIA_SLIDER_THUMB 4711 +#define IDR_MEDIA_VOLUME_SLIDER_THUMB 4712 +#define IDR_MEDIAPLAYER_PAUSE_BUTTON 4713 +#define IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER 4714 +#define IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN 4715 +#define IDR_MEDIAPLAYER_PLAY_BUTTON 4716 +#define IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER 4717 +#define IDR_MEDIAPLAYER_PLAY_BUTTON_DOWN 4718 +#define IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED 4719 +#define IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON 4720 +#define IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER 4721 +#define IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN 4722 +#define IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON 4723 +#define IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER 4724 +#define IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN 4725 +#define IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON 4726 +#define IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER 4727 +#define IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN 4728 +#define IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON 4729 +#define IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER 4730 +#define IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN 4731 +#define IDR_MEDIAPLAYER_SOUND_DISABLED 4732 +#define IDR_MEDIAPLAYER_SLIDER_THUMB 4733 +#define IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER 4734 +#define IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN 4735 +#define IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB 4736 +#define IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER 4737 +#define IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN 4738 +#define IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED 4739 +#define IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON 4740 +#define IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER 4741 +#define IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN 4742 +#define IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED 4743 +#define IDR_MEDIAPLAYER_FULLSCREEN_BUTTON 4744 +#define IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER 4745 +#define IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN 4746 +#define IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED 4747 +#define IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON 4748 +#define IDR_OVERHANG_PATTERN 4749 +#define IDR_PAN_SCROLL_ICON 4750 +#define IDR_SEARCH_CANCEL 4751 +#define IDR_SEARCH_CANCEL_PRESSED 4752 +#define IDR_SEARCH_MAGNIFIER 4753 +#define IDR_SEARCH_MAGNIFIER_RESULTS 4754 +#define IDR_TEXTAREA_RESIZER 4755 +#define IDR_AUTOFILL_CC_AMEX 4756 +#define IDR_AUTOFILL_CC_DINERS 4757 +#define IDR_AUTOFILL_CC_DISCOVER 4758 +#define IDR_AUTOFILL_CC_GENERIC 4759 +#define IDR_AUTOFILL_CC_JCB 4760 +#define IDR_AUTOFILL_CC_MASTERCARD 4761 +#define IDR_AUTOFILL_CC_SOLO 4762 +#define IDR_AUTOFILL_CC_VISA 4763 +#define IDR_PDF_BUTTON_FTP 4764 +#define IDR_PDF_BUTTON_FTP_HOVER 4765 +#define IDR_PDF_BUTTON_FTP_PRESSED 4766 +#define IDR_PDF_BUTTON_FTW 4767 +#define IDR_PDF_BUTTON_FTW_HOVER 4768 +#define IDR_PDF_BUTTON_FTW_PRESSED 4769 +#define IDR_PDF_BUTTON_ZOOMIN_END 4770 +#define IDR_PDF_BUTTON_ZOOMIN_END_HOVER 4771 +#define IDR_PDF_BUTTON_ZOOMIN_END_PRESSED 4772 +#define IDR_PDF_BUTTON_ZOOMIN 4773 +#define IDR_PDF_BUTTON_ZOOMIN_HOVER 4774 +#define IDR_PDF_BUTTON_ZOOMIN_PRESSED 4775 +#define IDR_PDF_BUTTON_ZOOMOUT 4776 +#define IDR_PDF_BUTTON_ZOOMOUT_HOVER 4777 +#define IDR_PDF_BUTTON_ZOOMOUT_PRESSED 4778 +#define IDR_PDF_BUTTON_SAVE 4779 +#define IDR_PDF_BUTTON_SAVE_HOVER 4780 +#define IDR_PDF_BUTTON_SAVE_PRESSED 4781 +#define IDR_PDF_BUTTON_PRINT 4782 +#define IDR_PDF_BUTTON_PRINT_HOVER 4783 +#define IDR_PDF_BUTTON_PRINT_PRESSED 4784 +#define IDR_PDF_THUMBNAIL_0 4785 +#define IDR_PDF_THUMBNAIL_1 4786 +#define IDR_PDF_THUMBNAIL_2 4787 +#define IDR_PDF_THUMBNAIL_3 4788 +#define IDR_PDF_THUMBNAIL_4 4789 +#define IDR_PDF_THUMBNAIL_5 4790 +#define IDR_PDF_THUMBNAIL_6 4791 +#define IDR_PDF_THUMBNAIL_7 4792 +#define IDR_PDF_THUMBNAIL_8 4793 +#define IDR_PDF_THUMBNAIL_9 4794 +#define IDR_PDF_THUMBNAIL_NUM_BACKGROUND 4795 +#define IDR_PDF_PROGRESS_BAR_0 4796 +#define IDR_PDF_PROGRESS_BAR_1 4797 +#define IDR_PDF_PROGRESS_BAR_2 4798 +#define IDR_PDF_PROGRESS_BAR_3 4799 +#define IDR_PDF_PROGRESS_BAR_4 4800 +#define IDR_PDF_PROGRESS_BAR_5 4801 +#define IDR_PDF_PROGRESS_BAR_6 4802 +#define IDR_PDF_PROGRESS_BAR_7 4803 +#define IDR_PDF_PROGRESS_BAR_8 4804 +#define IDR_PDF_PROGRESS_BAR_BACKGROUND 4805 +#define IDR_PDF_PAGE_INDICATOR_BACKGROUND 4806 +#define IDR_PDF_PAGE_DROPSHADOW 4807 +#define IDR_PASSWORD_GENERATION_ICON 4808 #endif // CEF_INCLUDE_CEF_PACK_RESOURCES_H_ diff --git a/cef/include/cef_pack_strings.h b/cef/include/cef_pack_strings.h index 872a15e6e..649b94609 100644 --- a/cef/include/cef_pack_strings.h +++ b/cef/include/cef_pack_strings.h @@ -39,142 +39,150 @@ // --------------------------------------------------------------------------- // From cef_strings.h: -#define IDS_MENU_BACK 26500 -#define IDS_MENU_FORWARD 26501 -#define IDS_MENU_RELOAD 26502 -#define IDS_MENU_RELOAD_NOCACHE 26503 -#define IDS_MENU_STOPLOAD 26504 -#define IDS_MENU_UNDO 26505 -#define IDS_MENU_REDO 26506 -#define IDS_MENU_CUT 26507 -#define IDS_MENU_COPY 26508 -#define IDS_MENU_PASTE 26509 -#define IDS_MENU_DELETE 26510 -#define IDS_MENU_SELECT_ALL 26511 -#define IDS_MENU_FIND 26512 -#define IDS_MENU_PRINT 26513 -#define IDS_MENU_VIEW_SOURCE 26514 +#define IDS_MENU_BACK 28000 +#define IDS_MENU_FORWARD 28001 +#define IDS_MENU_RELOAD 28002 +#define IDS_MENU_RELOAD_NOCACHE 28003 +#define IDS_MENU_STOPLOAD 28004 +#define IDS_MENU_UNDO 28005 +#define IDS_MENU_REDO 28006 +#define IDS_MENU_CUT 28007 +#define IDS_MENU_COPY 28008 +#define IDS_MENU_PASTE 28009 +#define IDS_MENU_DELETE 28010 +#define IDS_MENU_SELECT_ALL 28011 +#define IDS_MENU_FIND 28012 +#define IDS_MENU_PRINT 28013 +#define IDS_MENU_VIEW_SOURCE 28014 // --------------------------------------------------------------------------- // From ui_strings.h: -#define IDS_APP_MENU_EMPTY_SUBMENU 9500 -#define IDS_APP_UNTITLED_SHORTCUT_FILE_NAME 9501 -#define IDS_APP_SAVEAS_ALL_FILES 9502 -#define IDS_APP_SAVEAS_EXTENSION_FORMAT 9503 -#define IDS_APP_ACCACTION_PRESS 9504 -#define IDS_APP_ACCNAME_CLOSE 9505 -#define IDS_APP_ACCNAME_MINIMIZE 9506 -#define IDS_APP_ACCNAME_MAXIMIZE 9507 -#define IDS_APP_ACCNAME_RESTORE 9508 -#define IDS_APP_SCROLLBAR_CXMENU_SCROLLHERE 9509 -#define IDS_APP_SCROLLBAR_CXMENU_SCROLLLEFTEDGE 9510 -#define IDS_APP_SCROLLBAR_CXMENU_SCROLLRIGHTEDGE 9511 -#define IDS_APP_SCROLLBAR_CXMENU_SCROLLHOME 9512 -#define IDS_APP_SCROLLBAR_CXMENU_SCROLLEND 9513 -#define IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEUP 9514 -#define IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEDOWN 9515 -#define IDS_APP_SCROLLBAR_CXMENU_SCROLLLEFT 9516 -#define IDS_APP_SCROLLBAR_CXMENU_SCROLLRIGHT 9517 -#define IDS_APP_SCROLLBAR_CXMENU_SCROLLUP 9518 -#define IDS_APP_SCROLLBAR_CXMENU_SCROLLDOWN 9519 -#define IDS_APP_UNDO 9520 -#define IDS_APP_CUT 9521 -#define IDS_APP_COPY 9522 -#define IDS_APP_PASTE 9523 -#define IDS_APP_DELETE 9524 -#define IDS_APP_SELECT_ALL 9525 -#define IDS_APP_OK 9526 -#define IDS_APP_CANCEL 9527 -#define IDS_APP_CLOSE 9528 -#define IDS_APP_ESC_KEY 9529 -#define IDS_APP_TAB_KEY 9530 -#define IDS_APP_INSERT_KEY 9531 -#define IDS_APP_HOME_KEY 9532 -#define IDS_APP_DELETE_KEY 9533 -#define IDS_APP_END_KEY 9534 -#define IDS_APP_PAGEUP_KEY 9535 -#define IDS_APP_PAGEDOWN_KEY 9536 -#define IDS_APP_LEFT_ARROW_KEY 9537 -#define IDS_APP_RIGHT_ARROW_KEY 9538 -#define IDS_APP_RIGHT_UP_KEY 9539 -#define IDS_APP_RIGHT_DOWN_KEY 9540 -#define IDS_APP_ENTER_KEY 9541 -#define IDS_APP_F1_KEY 9542 -#define IDS_APP_F11_KEY 9543 -#define IDS_APP_BACKSPACE_KEY 9544 -#define IDS_APP_CONTROL_MODIFIER 9545 -#define IDS_APP_ALT_MODIFIER 9546 -#define IDS_APP_SHIFT_MODIFIER 9547 -#define IDS_APP_BYTES 9548 -#define IDS_APP_KIBIBYTES 9549 -#define IDS_APP_MEBIBYTES 9550 -#define IDS_APP_GIBIBYTES 9551 -#define IDS_APP_TEBIBYTES 9552 -#define IDS_APP_PEBIBYTES 9553 -#define IDS_APP_BYTES_PER_SECOND 9554 -#define IDS_APP_KIBIBYTES_PER_SECOND 9555 -#define IDS_APP_MEBIBYTES_PER_SECOND 9556 -#define IDS_APP_GIBIBYTES_PER_SECOND 9557 -#define IDS_APP_TEBIBYTES_PER_SECOND 9558 -#define IDS_APP_PEBIBYTES_PER_SECOND 9559 +#define IDS_APP_MENU_EMPTY_SUBMENU 11000 +#define IDS_APP_UNTITLED_SHORTCUT_FILE_NAME 11001 +#define IDS_APP_SAVEAS_ALL_FILES 11002 +#define IDS_APP_SAVEAS_EXTENSION_FORMAT 11003 +#define IDS_SELECT_FOLDER_BUTTON_TITLE 11004 +#define IDS_SELECT_FOLDER_DIALOG_TITLE 11005 +#define IDS_SAVE_AS_DIALOG_TITLE 11006 +#define IDS_OPEN_FILE_DIALOG_TITLE 11007 +#define IDS_OPEN_FILES_DIALOG_TITLE 11008 +#define IDS_SAVEAS_ALL_FILES 11009 +#define IDS_APP_ACCACTION_PRESS 11010 +#define IDS_APP_ACCNAME_CLOSE 11011 +#define IDS_APP_ACCNAME_MINIMIZE 11012 +#define IDS_APP_ACCNAME_MAXIMIZE 11013 +#define IDS_APP_ACCNAME_RESTORE 11014 +#define IDS_APP_SCROLLBAR_CXMENU_SCROLLHERE 11015 +#define IDS_APP_SCROLLBAR_CXMENU_SCROLLLEFTEDGE 11016 +#define IDS_APP_SCROLLBAR_CXMENU_SCROLLRIGHTEDGE 11017 +#define IDS_APP_SCROLLBAR_CXMENU_SCROLLHOME 11018 +#define IDS_APP_SCROLLBAR_CXMENU_SCROLLEND 11019 +#define IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEUP 11020 +#define IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEDOWN 11021 +#define IDS_APP_SCROLLBAR_CXMENU_SCROLLLEFT 11022 +#define IDS_APP_SCROLLBAR_CXMENU_SCROLLRIGHT 11023 +#define IDS_APP_SCROLLBAR_CXMENU_SCROLLUP 11024 +#define IDS_APP_SCROLLBAR_CXMENU_SCROLLDOWN 11025 +#define IDS_APP_UNDO 11026 +#define IDS_APP_CUT 11027 +#define IDS_APP_COPY 11028 +#define IDS_APP_PASTE 11029 +#define IDS_APP_DELETE 11030 +#define IDS_APP_SELECT_ALL 11031 +#define IDS_APP_OK 11032 +#define IDS_APP_CANCEL 11033 +#define IDS_APP_CLOSE 11034 +#define IDS_APP_ESC_KEY 11035 +#define IDS_APP_TAB_KEY 11036 +#define IDS_APP_INSERT_KEY 11037 +#define IDS_APP_HOME_KEY 11038 +#define IDS_APP_DELETE_KEY 11039 +#define IDS_APP_END_KEY 11040 +#define IDS_APP_PAGEUP_KEY 11041 +#define IDS_APP_PAGEDOWN_KEY 11042 +#define IDS_APP_LEFT_ARROW_KEY 11043 +#define IDS_APP_RIGHT_ARROW_KEY 11044 +#define IDS_APP_RIGHT_UP_KEY 11045 +#define IDS_APP_RIGHT_DOWN_KEY 11046 +#define IDS_APP_ENTER_KEY 11047 +#define IDS_APP_F1_KEY 11048 +#define IDS_APP_F11_KEY 11049 +#define IDS_APP_BACKSPACE_KEY 11050 +#define IDS_APP_CONTROL_MODIFIER 11051 +#define IDS_APP_ALT_MODIFIER 11052 +#define IDS_APP_SHIFT_MODIFIER 11053 +#define IDS_APP_COMMAND_MODIFIER 11054 +#define IDS_APP_BYTES 11055 +#define IDS_APP_KIBIBYTES 11056 +#define IDS_APP_MEBIBYTES 11057 +#define IDS_APP_GIBIBYTES 11058 +#define IDS_APP_TEBIBYTES 11059 +#define IDS_APP_PEBIBYTES 11060 +#define IDS_APP_BYTES_PER_SECOND 11061 +#define IDS_APP_KIBIBYTES_PER_SECOND 11062 +#define IDS_APP_MEBIBYTES_PER_SECOND 11063 +#define IDS_APP_GIBIBYTES_PER_SECOND 11064 +#define IDS_APP_TEBIBYTES_PER_SECOND 11065 +#define IDS_APP_PEBIBYTES_PER_SECOND 11066 // --------------------------------------------------------------------------- // From webkit_strings.h: -#define IDS_DETAILS_WITHOUT_SUMMARY_LABEL 16500 -#define IDS_SEARCHABLE_INDEX_INTRO 16501 -#define IDS_FORM_CALENDAR_CLEAR 16502 -#define IDS_FORM_CALENDAR_TODAY 16503 -#define IDS_FORM_DATE_FORMAT_DAY_IN_MONTH 16504 -#define IDS_FORM_DATE_FORMAT_MONTH 16505 -#define IDS_FORM_DATE_FORMAT_YEAR 16506 -#define IDS_FORM_SUBMIT_LABEL 16507 -#define IDS_FORM_INPUT_ALT 16508 -#define IDS_FORM_RESET_LABEL 16509 -#define IDS_FORM_FILE_BUTTON_LABEL 16510 -#define IDS_FORM_MULTIPLE_FILES_BUTTON_LABEL 16511 -#define IDS_FORM_FILE_NO_FILE_LABEL 16512 -#define IDS_FORM_FILE_NO_FILE_DRAG_LABEL 16513 -#define IDS_FORM_FILE_MULTIPLE_UPLOAD 16514 -#define IDS_RECENT_SEARCHES_NONE 16515 -#define IDS_RECENT_SEARCHES 16516 -#define IDS_RECENT_SEARCHES_CLEAR 16517 -#define IDS_IMAGE_TITLE_FOR_FILENAME 16518 -#define IDS_AX_ROLE_WEB_AREA 16519 -#define IDS_AX_ROLE_LINK 16520 -#define IDS_AX_ROLE_LIST_MARKER 16521 -#define IDS_AX_ROLE_IMAGE_MAP 16522 -#define IDS_AX_ROLE_HEADING 16523 -#define IDS_AX_ROLE_FOOTER 16524 -#define IDS_AX_BUTTON_ACTION_VERB 16525 -#define IDS_AX_RADIO_BUTTON_ACTION_VERB 16526 -#define IDS_AX_TEXT_FIELD_ACTION_VERB 16527 -#define IDS_AX_CHECKED_CHECK_BOX_ACTION_VERB 16528 -#define IDS_AX_UNCHECKED_CHECK_BOX_ACTION_VERB 16529 -#define IDS_AX_LINK_ACTION_VERB 16530 -#define IDS_KEYGEN_HIGH_GRADE_KEY 16531 -#define IDS_KEYGEN_MED_GRADE_KEY 16532 -#define IDS_FORM_VALIDATION_VALUE_MISSING_MULTIPLE_FILE 16533 -#define IDS_FORM_VALIDATION_TYPE_MISMATCH 16534 -#define IDS_FORM_VALIDATION_TYPE_MISMATCH_MULTIPLE_EMAIL 16535 -#define IDS_FORM_VALIDATION_RANGE_UNDERFLOW 16536 -#define IDS_FORM_VALIDATION_RANGE_OVERFLOW 16537 -#define IDS_FORM_VALIDATION_STEP_MISMATCH 16538 -#define IDS_FORM_VALIDATION_VALUE_MISSING 16539 -#define IDS_FORM_VALIDATION_VALUE_MISSING_CHECKBOX 16540 -#define IDS_FORM_VALIDATION_VALUE_MISSING_FILE 16541 -#define IDS_FORM_VALIDATION_VALUE_MISSING_RADIO 16542 -#define IDS_FORM_VALIDATION_VALUE_MISSING_SELECT 16543 -#define IDS_FORM_VALIDATION_TYPE_MISMATCH_EMAIL 16544 -#define IDS_FORM_VALIDATION_TYPE_MISMATCH_URL 16545 -#define IDS_FORM_VALIDATION_PATTERN_MISMATCH 16546 -#define IDS_FORM_VALIDATION_TOO_LONG 16547 -#define IDS_PDF_NEED_PASSWORD 16548 -#define IDS_PDF_PAGE_LOADING 16549 -#define IDS_PDF_LOADING_PROGRESS 16550 -#define IDS_PDF_PAGE_LOAD_FAILED 16551 -#define IDS_PDF_PROGRESS_LOADING 16552 -#define IDS_PLUGIN_INITIALIZATION_ERROR 16553 +#define IDS_DETAILS_WITHOUT_SUMMARY_LABEL 18000 +#define IDS_SEARCHABLE_INDEX_INTRO 18001 +#define IDS_FORM_CALENDAR_CLEAR 18002 +#define IDS_FORM_CALENDAR_TODAY 18003 +#define IDS_FORM_DATE_FORMAT_DAY_IN_MONTH 18004 +#define IDS_FORM_DATE_FORMAT_MONTH 18005 +#define IDS_FORM_DATE_FORMAT_YEAR 18006 +#define IDS_FORM_SUBMIT_LABEL 18007 +#define IDS_FORM_INPUT_ALT 18008 +#define IDS_FORM_RESET_LABEL 18009 +#define IDS_FORM_FILE_BUTTON_LABEL 18010 +#define IDS_FORM_MULTIPLE_FILES_BUTTON_LABEL 18011 +#define IDS_FORM_FILE_NO_FILE_LABEL 18012 +#define IDS_FORM_FILE_NO_FILE_DRAG_LABEL 18013 +#define IDS_FORM_FILE_MULTIPLE_UPLOAD 18014 +#define IDS_FORM_OTHER_COLOR_LABEL 18015 +#define IDS_RECENT_SEARCHES_NONE 18016 +#define IDS_RECENT_SEARCHES 18017 +#define IDS_RECENT_SEARCHES_CLEAR 18018 +#define IDS_IMAGE_TITLE_FOR_FILENAME 18019 +#define IDS_AX_ROLE_WEB_AREA 18020 +#define IDS_AX_ROLE_LINK 18021 +#define IDS_AX_ROLE_LIST_MARKER 18022 +#define IDS_AX_ROLE_IMAGE_MAP 18023 +#define IDS_AX_ROLE_HEADING 18024 +#define IDS_AX_ROLE_FOOTER 18025 +#define IDS_AX_BUTTON_ACTION_VERB 18026 +#define IDS_AX_RADIO_BUTTON_ACTION_VERB 18027 +#define IDS_AX_TEXT_FIELD_ACTION_VERB 18028 +#define IDS_AX_CHECKED_CHECK_BOX_ACTION_VERB 18029 +#define IDS_AX_UNCHECKED_CHECK_BOX_ACTION_VERB 18030 +#define IDS_AX_LINK_ACTION_VERB 18031 +#define IDS_KEYGEN_HIGH_GRADE_KEY 18032 +#define IDS_KEYGEN_MED_GRADE_KEY 18033 +#define IDS_FORM_VALIDATION_VALUE_MISSING_MULTIPLE_FILE 18034 +#define IDS_FORM_VALIDATION_TYPE_MISMATCH 18035 +#define IDS_FORM_VALIDATION_TYPE_MISMATCH_MULTIPLE_EMAIL 18036 +#define IDS_FORM_VALIDATION_RANGE_UNDERFLOW 18037 +#define IDS_FORM_VALIDATION_RANGE_OVERFLOW 18038 +#define IDS_FORM_VALIDATION_STEP_MISMATCH 18039 +#define IDS_FORM_VALIDATION_VALUE_MISSING 18040 +#define IDS_FORM_VALIDATION_VALUE_MISSING_CHECKBOX 18041 +#define IDS_FORM_VALIDATION_VALUE_MISSING_FILE 18042 +#define IDS_FORM_VALIDATION_VALUE_MISSING_RADIO 18043 +#define IDS_FORM_VALIDATION_VALUE_MISSING_SELECT 18044 +#define IDS_FORM_VALIDATION_TYPE_MISMATCH_EMAIL 18045 +#define IDS_FORM_VALIDATION_TYPE_MISMATCH_URL 18046 +#define IDS_FORM_VALIDATION_PATTERN_MISMATCH 18047 +#define IDS_FORM_VALIDATION_TOO_LONG 18048 +#define IDS_PDF_NEED_PASSWORD 18049 +#define IDS_PDF_PAGE_LOADING 18050 +#define IDS_PDF_LOADING_PROGRESS 18051 +#define IDS_PDF_PAGE_LOAD_FAILED 18052 +#define IDS_PDF_PROGRESS_LOADING 18053 +#define IDS_PLUGIN_INITIALIZATION_ERROR 18054 #endif // CEF_INCLUDE_CEF_PACK_STRINGS_H_ diff --git a/cef/include/cef_v8.h b/cef/include/cef_v8.h index b1b0dc7b0..d192e86f9 100644 --- a/cef/include/cef_v8.h +++ b/cef/include/cef_v8.h @@ -46,6 +46,7 @@ class CefV8Exception; class CefV8Handler; +class CefV8StackFrame; class CefV8Value; @@ -739,4 +740,84 @@ class CefV8Value : public virtual CefBase { const CefV8ValueList& arguments) =0; }; +/// +// Class representing a V8 stack trace. The methods of this class may only be +// called on the render process main thread. +/// +/*--cef(source=library)--*/ +class CefV8StackTrace : public virtual CefBase { + public: + /// + // Returns the stack trace for the currently active context. |frame_limit| is + // the maximum number of frames that will be captured. + /// + /*--cef()--*/ + static CefRefPtr GetCurrent(int frame_limit); + + /// + // Returns the number of stack frames. + /// + /*--cef()--*/ + virtual int GetFrameCount() =0; + + /// + // Returns the stack frame at the specified 0-based index. + /// + /*--cef()--*/ + virtual CefRefPtr GetFrame(int index) =0; +}; + +/// +// Class representing a V8 stack frame. The methods of this class may only be +// called on the render process main thread. +/// +/*--cef(source=library)--*/ +class CefV8StackFrame : public virtual CefBase { + public: + /// + // Returns the name of the resource script that contains the function. + /// + /*--cef()--*/ + virtual CefString GetScriptName() =0; + + /// + // Returns the name of the resource script that contains the function or the + // sourceURL value if the script name is undefined and its source ends with + // a "//@ sourceURL=..." string. + /// + /*--cef()--*/ + virtual CefString GetScriptNameOrSourceURL() =0; + + /// + // Returns the name of the function. + /// + /*--cef()--*/ + virtual CefString GetFunctionName() =0; + + /// + // Returns the 1-based line number for the function call or 0 if unknown. + /// + /*--cef()--*/ + virtual int GetLineNumber() =0; + + /// + // Returns the 1-based column offset on the line for the function call or 0 if + // unknown. + /// + /*--cef()--*/ + virtual int GetColumn() =0; + + /// + // Returns true if the function was compiled using eval(). + /// + /*--cef()--*/ + virtual bool IsEval() =0; + + /// + // Returns true if the function was called as a constructor via "new". + /// + /*--cef()--*/ + virtual bool IsConstructor() =0; +}; + #endif // CEF_INCLUDE_CEF_V8_H_ diff --git a/cef/include/cef_version.h b/cef/include/cef_version.h index 0962ebb80..2f9a33528 100644 --- a/cef/include/cef_version.h +++ b/cef/include/cef_version.h @@ -35,13 +35,13 @@ #ifndef CEF_INCLUDE_CEF_VERSION_H_ #define CEF_INCLUDE_CEF_VERSION_H_ -#define CEF_REVISION 735 +#define CEF_REVISION 785 #define COPYRIGHT_YEAR 2012 -#define CHROME_VERSION_MAJOR 21 +#define CHROME_VERSION_MAJOR 23 #define CHROME_VERSION_MINOR 0 -#define CHROME_VERSION_BUILD 1180 -#define CHROME_VERSION_PATCH 18 +#define CHROME_VERSION_BUILD 1248 +#define CHROME_VERSION_PATCH 0 #define DO_MAKE_STRING(p) #p #define MAKE_STRING(p) DO_MAKE_STRING(p) diff --git a/cef/include/internal/cef_string_wrappers.h b/cef/include/internal/cef_string_wrappers.h index c0507c1cc..b3012331b 100644 --- a/cef/include/internal/cef_string_wrappers.h +++ b/cef/include/internal/cef_string_wrappers.h @@ -314,7 +314,8 @@ class CefStringBase { } CefStringBase(const char* src) // NOLINT(runtime/explicit) : string_(NULL), owner_(false) { - FromString(std::string(src)); + if (src) + FromString(std::string(src)); } /// @@ -328,7 +329,8 @@ class CefStringBase { } CefStringBase(const wchar_t* src) // NOLINT(runtime/explicit) : string_(NULL), owner_(false) { - FromWString(std::wstring(src)); + if (src) + FromWString(std::wstring(src)); } #if (defined(BUILDING_CEF_SHARED) && defined(WCHAR_T_IS_UTF32)) @@ -343,7 +345,8 @@ class CefStringBase { } CefStringBase(const char16* src) // NOLINT(runtime/explicit) : string_(NULL), owner_(false) { - FromString16(string16(src)); + if (src) + FromString16(string16(src)); } #endif // BUILDING_CEF_SHARED && WCHAR_T_IS_UTF32 @@ -355,7 +358,8 @@ class CefStringBase { /// CefStringBase(const char_type* src, size_t src_len, bool copy) : string_(NULL), owner_(false) { - FromString(src, src_len, copy); + if (src && src_len > 0) + FromString(src, src_len, copy); } /// diff --git a/cef/include/internal/cef_types.h b/cef/include/internal/cef_types.h index 0d6cea0ff..28b20e32a 100644 --- a/cef/include/internal/cef_types.h +++ b/cef/include/internal/cef_types.h @@ -222,18 +222,18 @@ typedef struct _cef_settings_t { bool auto_detect_proxy_settings_enabled; /// - // The fully qualified path for the cef.pak file. If this value is empty - // the cef.pak file must be located in the module directory. This value is - // ignored on Mac OS X where pack files are always loaded from the app bundle - // resource directory. + // The fully qualified path for the resources directory. If this value is + // empty the cef.pak and/or devtools_resources.pak files must be located in + // the module directory on Windows/Linux or the app bundle Resources directory + // on Mac OS X. /// - cef_string_t pack_file_path; + cef_string_t resources_dir_path; /// // The fully qualified path for the locales directory. If this value is empty // the locales directory must be located in the module directory. This value // is ignored on Mac OS X where pack files are always loaded from the app - // bundle resource directory. + // bundle Resources directory. /// cef_string_t locales_dir_path; @@ -1199,15 +1199,6 @@ enum cef_xml_node_type_t { XML_NODE_COMMENT, }; -/// -// Status message types. -/// -enum cef_handler_statustype_t { - STATUSTYPE_TEXT = 0, - STATUSTYPE_MOUSEOVER_URL, - STATUSTYPE_KEYBOARD_FOCUS_URL, -}; - /// // Popup window features. /// @@ -1237,9 +1228,9 @@ typedef struct _cef_popup_features_t { // Proxy types. /// enum cef_proxy_type_t { - PROXY_TYPE_DIRECT = 0, - PROXY_TYPE_NAMED, - PROXY_TYPE_PAC_STRING, + CEF_PROXY_TYPE_DIRECT = 0, + CEF_PROXY_TYPE_NAMED, + CEF_PROXY_TYPE_PAC_STRING, }; /// diff --git a/cef/include/internal/cef_types_wrappers.h b/cef/include/internal/cef_types_wrappers.h index 115a4cc4b..2fea2173e 100644 --- a/cef/include/internal/cef_types_wrappers.h +++ b/cef/include/internal/cef_types_wrappers.h @@ -264,7 +264,7 @@ struct CefSettingsTraits { cef_string_clear(&s->locale); cef_string_clear(&s->log_file); cef_string_clear(&s->javascript_flags); - cef_string_clear(&s->pack_file_path); + cef_string_clear(&s->resources_dir_path); cef_string_clear(&s->locales_dir_path); } @@ -294,8 +294,8 @@ struct CefSettingsTraits { target->auto_detect_proxy_settings_enabled = src->auto_detect_proxy_settings_enabled; - cef_string_set(src->pack_file_path.str, src->pack_file_path.length, - &target->pack_file_path, copy); + cef_string_set(src->resources_dir_path.str, src->resources_dir_path.length, + &target->resources_dir_path, copy); cef_string_set(src->locales_dir_path.str, src->locales_dir_path.length, &target->locales_dir_path, copy); target->pack_loading_disabled = src->pack_loading_disabled; @@ -556,7 +556,7 @@ class CefProxyInfo : public CefStructBase { // Use a direction connection instead of a proxy. /// void UseDirect() { - proxyType = PROXY_TYPE_DIRECT; + proxyType = CEF_PROXY_TYPE_DIRECT; } /// @@ -569,7 +569,7 @@ class CefProxyInfo : public CefStructBase { // "foo1:80;foo2:80". /// void UseNamedProxy(const CefString& proxy_uri_list) { - proxyType = PROXY_TYPE_NAMED; + proxyType = CEF_PROXY_TYPE_NAMED; (CefString(&proxyList)) = proxy_uri_list; } @@ -578,13 +578,13 @@ class CefProxyInfo : public CefStructBase { // example, "PROXY foobar:99; SOCKS fml:2; DIRECT". /// void UsePacString(const CefString& pac_string) { - proxyType = PROXY_TYPE_PAC_STRING; + proxyType = CEF_PROXY_TYPE_PAC_STRING; (CefString(&proxyList)) = pac_string; } - bool IsDirect() const { return proxyType == PROXY_TYPE_DIRECT; } - bool IsNamedProxy() const { return proxyType == PROXY_TYPE_NAMED; } - bool IsPacString() const { return proxyType == PROXY_TYPE_PAC_STRING; } + bool IsDirect() const { return proxyType == CEF_PROXY_TYPE_DIRECT; } + bool IsNamedProxy() const { return proxyType == CEF_PROXY_TYPE_NAMED; } + bool IsPacString() const { return proxyType == CEF_PROXY_TYPE_PAC_STRING; } CefString ProxyList() const { return CefString(&proxyList); } }; diff --git a/cef/libcef_dll/cpptoc/display_handler_cpptoc.cc b/cef/libcef_dll/cpptoc/display_handler_cpptoc.cc index 36a21e4e9..68b675964 100644 --- a/cef/libcef_dll/cpptoc/display_handler_cpptoc.cc +++ b/cef/libcef_dll/cpptoc/display_handler_cpptoc.cc @@ -113,7 +113,7 @@ int CEF_CALLBACK display_handler_on_tooltip(struct _cef_display_handler_t* self, void CEF_CALLBACK display_handler_on_status_message( struct _cef_display_handler_t* self, cef_browser_t* browser, - const cef_string_t* value, enum cef_handler_statustype_t type) { + const cef_string_t* value) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -128,8 +128,7 @@ void CEF_CALLBACK display_handler_on_status_message( // Execute CefDisplayHandlerCppToC::Get(self)->OnStatusMessage( CefBrowserCToCpp::Wrap(browser), - CefString(value), - type); + CefString(value)); } int CEF_CALLBACK display_handler_on_console_message( diff --git a/cef/libcef_dll/ctocpp/command_line_ctocpp.cc b/cef/libcef_dll/ctocpp/command_line_ctocpp.cc index 5838c777b..9dad79281 100644 --- a/cef/libcef_dll/ctocpp/command_line_ctocpp.cc +++ b/cef/libcef_dll/ctocpp/command_line_ctocpp.cc @@ -136,6 +136,30 @@ void CefCommandLineCToCpp::Reset() { struct_->reset(struct_); } +void CefCommandLineCToCpp::GetArgv(std::vector& argv) { + if (CEF_MEMBER_MISSING(struct_, get_argv)) + return; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Translate param: argv; type: string_vec_byref + cef_string_list_t argvList = cef_string_list_alloc(); + DCHECK(argvList); + if (argvList) + transfer_string_list_contents(argv, argvList); + + // Execute + struct_->get_argv(struct_, + argvList); + + // Restore param:argv; type: string_vec_byref + if (argvList) { + argv.clear(); + transfer_string_list_contents(argvList, argv); + cef_string_list_free(argvList); + } +} + CefString CefCommandLineCToCpp::GetCommandLineString() { if (CEF_MEMBER_MISSING(struct_, get_command_line_string)) return CefString(); diff --git a/cef/libcef_dll/ctocpp/command_line_ctocpp.h b/cef/libcef_dll/ctocpp/command_line_ctocpp.h index 9156aec7d..437f23649 100644 --- a/cef/libcef_dll/ctocpp/command_line_ctocpp.h +++ b/cef/libcef_dll/ctocpp/command_line_ctocpp.h @@ -18,6 +18,7 @@ #pragma message("Warning: "__FILE__" may be accessed wrapper-side only") #else // USING_CEF_SHARED +#include #include "include/cef_command_line.h" #include "include/capi/cef_command_line_capi.h" #include "libcef_dll/ctocpp/ctocpp.h" @@ -40,6 +41,7 @@ class CefCommandLineCToCpp virtual void InitFromArgv(int argc, const char* const* argv) OVERRIDE; virtual void InitFromString(const CefString& command_line) OVERRIDE; virtual void Reset() OVERRIDE; + virtual void GetArgv(std::vector& argv) OVERRIDE; virtual CefString GetCommandLineString() OVERRIDE; virtual CefString GetProgram() OVERRIDE; virtual void SetProgram(const CefString& program) OVERRIDE; diff --git a/cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.cc b/cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.cc new file mode 100644 index 000000000..8d685df90 --- /dev/null +++ b/cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.cc @@ -0,0 +1,121 @@ +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// reserved. Use of this source code is governed by a BSD-style license that +// can be found in the LICENSE file. +// +// --------------------------------------------------------------------------- +// +// This file was generated by the CEF translator tool. If making changes by +// hand only do so within the body of existing method and function +// implementations. See the translator.README.txt file in the tools directory +// for more information. +// + +#include "libcef_dll/ctocpp/v8stack_frame_ctocpp.h" + + +// VIRTUAL METHODS - Body may be edited by hand. + +CefString CefV8StackFrameCToCpp::GetScriptName() { + if (CEF_MEMBER_MISSING(struct_, get_script_name)) + return CefString(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + cef_string_userfree_t _retval = struct_->get_script_name(struct_); + + // Return type: string + CefString _retvalStr; + _retvalStr.AttachToUserFree(_retval); + return _retvalStr; +} + +CefString CefV8StackFrameCToCpp::GetScriptNameOrSourceURL() { + if (CEF_MEMBER_MISSING(struct_, get_script_name_or_source_url)) + return CefString(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + cef_string_userfree_t _retval = struct_->get_script_name_or_source_url( + struct_); + + // Return type: string + CefString _retvalStr; + _retvalStr.AttachToUserFree(_retval); + return _retvalStr; +} + +CefString CefV8StackFrameCToCpp::GetFunctionName() { + if (CEF_MEMBER_MISSING(struct_, get_function_name)) + return CefString(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + cef_string_userfree_t _retval = struct_->get_function_name(struct_); + + // Return type: string + CefString _retvalStr; + _retvalStr.AttachToUserFree(_retval); + return _retvalStr; +} + +int CefV8StackFrameCToCpp::GetLineNumber() { + if (CEF_MEMBER_MISSING(struct_, get_line_number)) + return 0; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + int _retval = struct_->get_line_number(struct_); + + // Return type: simple + return _retval; +} + +int CefV8StackFrameCToCpp::GetColumn() { + if (CEF_MEMBER_MISSING(struct_, get_column)) + return 0; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + int _retval = struct_->get_column(struct_); + + // Return type: simple + return _retval; +} + +bool CefV8StackFrameCToCpp::IsEval() { + if (CEF_MEMBER_MISSING(struct_, is_eval)) + return false; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + int _retval = struct_->is_eval(struct_); + + // Return type: bool + return _retval?true:false; +} + +bool CefV8StackFrameCToCpp::IsConstructor() { + if (CEF_MEMBER_MISSING(struct_, is_constructor)) + return false; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + int _retval = struct_->is_constructor(struct_); + + // Return type: bool + return _retval?true:false; +} + + +#ifndef NDEBUG +template<> long CefCToCpp::DebugObjCt = 0; +#endif + diff --git a/cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.h b/cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.h new file mode 100644 index 000000000..6a6a32999 --- /dev/null +++ b/cef/libcef_dll/ctocpp/v8stack_frame_ctocpp.h @@ -0,0 +1,48 @@ +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// reserved. Use of this source code is governed by a BSD-style license that +// can be found in the LICENSE file. +// +// --------------------------------------------------------------------------- +// +// This file was generated by the CEF translator tool. If making changes by +// hand only do so within the body of existing method and function +// implementations. See the translator.README.txt file in the tools directory +// for more information. +// + +#ifndef CEF_LIBCEF_DLL_CTOCPP_V8STACK_FRAME_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_V8STACK_FRAME_CTOCPP_H_ +#pragma once + +#ifndef USING_CEF_SHARED +#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") +#else // USING_CEF_SHARED + +#include "include/cef_v8.h" +#include "include/capi/cef_v8_capi.h" +#include "libcef_dll/ctocpp/ctocpp.h" + +// Wrap a C structure with a C++ class. +// This class may be instantiated and accessed wrapper-side only. +class CefV8StackFrameCToCpp + : public CefCToCpp { + public: + explicit CefV8StackFrameCToCpp(cef_v8stack_frame_t* str) + : CefCToCpp( + str) {} + virtual ~CefV8StackFrameCToCpp() {} + + // CefV8StackFrame methods + virtual CefString GetScriptName() OVERRIDE; + virtual CefString GetScriptNameOrSourceURL() OVERRIDE; + virtual CefString GetFunctionName() OVERRIDE; + virtual int GetLineNumber() OVERRIDE; + virtual int GetColumn() OVERRIDE; + virtual bool IsEval() OVERRIDE; + virtual bool IsConstructor() OVERRIDE; +}; + +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_V8STACK_FRAME_CTOCPP_H_ + diff --git a/cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc b/cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc new file mode 100644 index 000000000..a569e3948 --- /dev/null +++ b/cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc @@ -0,0 +1,65 @@ +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// reserved. Use of this source code is governed by a BSD-style license that +// can be found in the LICENSE file. +// +// --------------------------------------------------------------------------- +// +// This file was generated by the CEF translator tool. If making changes by +// hand only do so within the body of existing method and function +// implementations. See the translator.README.txt file in the tools directory +// for more information. +// + +#include "libcef_dll/ctocpp/v8stack_frame_ctocpp.h" +#include "libcef_dll/ctocpp/v8stack_trace_ctocpp.h" + + +// STATIC METHODS - Body may be edited by hand. + +CefRefPtr CefV8StackTrace::GetCurrent(int frame_limit) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + cef_v8stack_trace_t* _retval = cef_v8stack_trace_get_current( + frame_limit); + + // Return type: refptr_same + return CefV8StackTraceCToCpp::Wrap(_retval); +} + + +// VIRTUAL METHODS - Body may be edited by hand. + +int CefV8StackTraceCToCpp::GetFrameCount() { + if (CEF_MEMBER_MISSING(struct_, get_frame_count)) + return 0; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + int _retval = struct_->get_frame_count(struct_); + + // Return type: simple + return _retval; +} + +CefRefPtr CefV8StackTraceCToCpp::GetFrame(int index) { + if (CEF_MEMBER_MISSING(struct_, get_frame)) + return NULL; + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + cef_v8stack_frame_t* _retval = struct_->get_frame(struct_, + index); + + // Return type: refptr_same + return CefV8StackFrameCToCpp::Wrap(_retval); +} + + +#ifndef NDEBUG +template<> long CefCToCpp::DebugObjCt = 0; +#endif + diff --git a/cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.h b/cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.h new file mode 100644 index 000000000..05ac92a90 --- /dev/null +++ b/cef/libcef_dll/ctocpp/v8stack_trace_ctocpp.h @@ -0,0 +1,43 @@ +// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights +// reserved. Use of this source code is governed by a BSD-style license that +// can be found in the LICENSE file. +// +// --------------------------------------------------------------------------- +// +// This file was generated by the CEF translator tool. If making changes by +// hand only do so within the body of existing method and function +// implementations. See the translator.README.txt file in the tools directory +// for more information. +// + +#ifndef CEF_LIBCEF_DLL_CTOCPP_V8STACK_TRACE_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_V8STACK_TRACE_CTOCPP_H_ +#pragma once + +#ifndef USING_CEF_SHARED +#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") +#else // USING_CEF_SHARED + +#include "include/cef_v8.h" +#include "include/capi/cef_v8_capi.h" +#include "libcef_dll/ctocpp/ctocpp.h" + +// Wrap a C structure with a C++ class. +// This class may be instantiated and accessed wrapper-side only. +class CefV8StackTraceCToCpp + : public CefCToCpp { + public: + explicit CefV8StackTraceCToCpp(cef_v8stack_trace_t* str) + : CefCToCpp( + str) {} + virtual ~CefV8StackTraceCToCpp() {} + + // CefV8StackTrace methods + virtual int GetFrameCount() OVERRIDE; + virtual CefRefPtr GetFrame(int index) OVERRIDE; +}; + +#endif // USING_CEF_SHARED +#endif // CEF_LIBCEF_DLL_CTOCPP_V8STACK_TRACE_CTOCPP_H_ + diff --git a/cef/libcef_dll/wrapper/cef_byte_read_handler.cc b/cef/libcef_dll/wrapper/cef_byte_read_handler.cc index 8ae5b2d8b..2d0b2085a 100644 --- a/cef/libcef_dll/wrapper/cef_byte_read_handler.cc +++ b/cef/libcef_dll/wrapper/cef_byte_read_handler.cc @@ -13,7 +13,7 @@ CefByteReadHandler::CefByteReadHandler(const unsigned char* bytes, size_t size, size_t CefByteReadHandler::Read(void* ptr, size_t size, size_t n) { AutoLock lock_scope(this); - size_t s = (size_ - offset_) / size; + size_t s = static_cast(size_ - offset_) / size; size_t ret = std::min(n, s); memcpy(ptr, bytes_ + offset_, ret * size); offset_ += ret * size; diff --git a/cef/libcef_dll/wrapper/libcef_dll_wrapper.cc b/cef/libcef_dll/wrapper/libcef_dll_wrapper.cc index 87e9973a5..4ec3ed6da 100644 --- a/cef/libcef_dll/wrapper/libcef_dll_wrapper.cc +++ b/cef/libcef_dll/wrapper/libcef_dll_wrapper.cc @@ -84,6 +84,8 @@ #include "libcef_dll/ctocpp/urlrequest_ctocpp.h" #include "libcef_dll/ctocpp/v8context_ctocpp.h" #include "libcef_dll/ctocpp/v8exception_ctocpp.h" +#include "libcef_dll/ctocpp/v8stack_frame_ctocpp.h" +#include "libcef_dll/ctocpp/v8stack_trace_ctocpp.h" #include "libcef_dll/ctocpp/v8value_ctocpp.h" #include "libcef_dll/ctocpp/web_plugin_info_ctocpp.h" #include "libcef_dll/ctocpp/xml_reader_ctocpp.h" @@ -199,6 +201,8 @@ CEF_GLOBAL void CefShutdown() { DCHECK_EQ(CefV8ContextCToCpp::DebugObjCt, 0); DCHECK_EQ(CefV8ExceptionCToCpp::DebugObjCt, 0); DCHECK_EQ(CefV8HandlerCppToC::DebugObjCt, 0); + DCHECK_EQ(CefV8StackFrameCToCpp::DebugObjCt, 0); + DCHECK_EQ(CefV8StackTraceCToCpp::DebugObjCt, 0); DCHECK_EQ(CefV8ValueCToCpp::DebugObjCt, 0); DCHECK_EQ(CefWebPluginInfoCToCpp::DebugObjCt, 0); DCHECK_EQ(CefWebPluginInfoVisitorCppToC::DebugObjCt, 0); diff --git a/cef/resources/am.lproj/locale.pak b/cef/resources/am.lproj/locale.pak deleted file mode 100644 index ad835b65d..000000000 Binary files a/cef/resources/am.lproj/locale.pak and /dev/null differ diff --git a/cef/resources/ar.lproj/locale.pak b/cef/resources/ar.lproj/locale.pak deleted file mode 100644 index af8e13e50..000000000 Binary files a/cef/resources/ar.lproj/locale.pak and /dev/null differ diff --git a/cef/resources/bg.lproj/locale.pak b/cef/resources/bg.lproj/locale.pak deleted file mode 100644 index 38e14d6d9..000000000 Binary files a/cef/resources/bg.lproj/locale.pak and /dev/null differ diff --git a/cef/resources/blackberry/popupControlBlackBerry.css b/cef/resources/blackberry/popupControlBlackBerry.css deleted file mode 100644 index 340bc61b1..000000000 --- a/cef/resources/blackberry/popupControlBlackBerry.css +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (C) Research In Motion Limited, 2012. All rights reserved. - */ - -html { - overflow: hidden; -} - -body { - padding: 0; - margin: 0; - font-family: "Myriad Pro", "Arial", "Helvetica", sans-serif; - font-size: 40px; - - -webkit-user-select: none; - user-select: none; - - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-box-align: center; - -webkit-box-pack: center; - - display: box; - box-orient: vertical; - box-align: center; - box-pack: center; -} - -.popup-area { - width: 100%; - height: 100%; - - display: -webkit-box; - display: box; - -webkit-box-orient: vertical; - box-orient: vertical; -} - - .popup-area>:first-child { - -webkit-box-flex: 1; - box-flex: 1; - } - - .popup-buttons { - display: -webkit-box; - -webkit-box-orient: horizontal; - -webkit-box-pack: center; - -webkit-box-align: stretch; - - border-image-source: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB8AAAB6CAMAAABwSXjiAAAAvVBMVEXc3Nzd3d3e3t7d3d3c3Nzd3d3f39/e3t7e3t7c3Nzc3Nzd3d3c3Nzc3Nzc3Nze3t7d3d3e3t7e3t7d3d3c3Nzd3d3c3Nzc3Nzd3d3c3Nzd3d3c3Nzd3d3c3Nzd3d3e3t7c3Nzf39/e3t7d3d3l5eXg4ODq6urj4+Pn5+fp6enk5OTm5ubo6Oji4uLh4eH09PT29vb6+vrx8fHw8PDv7+/u7u7t7e3r6+v19fX5+fn4+Pjz8/Py8vL39/fs7OxBzuRYAAAAIHRSTlMAAOqH6qj5xksJP1HJzIcG5JYDEuF+VFd4cud1CeSEk7PB98YAAADeSURBVHhezMlHEYBAAARBHF1OJP+ycDCfra2jv30kZv/Ffv8n2/4P2/6R2X8y+wdm/4vJfzP7ZyZ/YfavTP7G5O9M/pfJP5j6X3fzkYNAEANR1O7JkZxzztz/eDQaIRhB18byhr99KhXtcep+won9ihP7ESf2C07sW5y6n3FiP+DU/YYT+x33977DqfsKp+4h5JDMGmUogh7RAnqLYugxtQ26bxD3Nu6GTNwZO7k5tc6Z0zN+Os8d7HHlHPzkgF/OnmNtvarfXdabDahWMvI/1J8k9FVa5oW1Ii/TNzwAJkil621gpK4AAAAASUVORK5CYII="); - border-image-slice: 14 14 14 14 fill; - border-width: 14px; - - text-align: center; - } - - .popup-button-divider { - width: 2px; - background-color: rgba(0, 0, 0, 0.2); - border-width: 14px 0; - /* border image takes an image, so use a solid-colour gradient */ - border-image-source: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.2) 0%, rgba(0, 0, 0, 0.2) 0%); - border-image-slice: 1 0 1 0; - border-image-outset: 1 0 1 0; - } - - .popup-button { - color: inherit; - font: inherit; - text-shadow: rgba(255, 255, 255, 0.5) 0 -2px; - padding: 0; - margin: 0; - background: none; - line-height: 200%; - display: block; - - width: 0; - -webkit-box-flex: 1; - - border: 14px solid transparent; - } - - .popup-button:active { /* all current popups have at most two buttons, so this is unused atm */ - border-image-source: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAB4AQMAAAAJ9grDAAAAA1BMVEUAAACnej3aAAAAAXRSTlMz/za5cAAAABVJREFUeF7lwIEAAAAAgKD9qQepMAMA8AABd9vWlQAAAABJRU5ErkJggg=="); - border-image-slice: 1 0 1 0 fill; - padding: 14px; - margin: -14px; - } - - .popup-button:first-child:active { /* TODO: RTL */ - border-image-source: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAB4CAMAAADMioJkAAAAPFBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQLyYwAAAAFHRSTlMzAC8BGygeDzIuEBoiGBEtAhcNKSH3iKYAAABFSURBVHhe7cy5AYAwEMTA27PN/9N/r0QQqAVW4QSKX+Wcc84NhCQ0QkfoCYUTrYQyAjQRNBO0EFQJ2naAjjNf+LpquyMeT+sA9bsu6t8AAAAASUVORK5CYII="); - border-image-slice: 14 0 14 14 fill; - border-image-width: 1 0 1 1; - padding: 14px; - margin: -14px; - } - - .popup-button:last-child:active { /* TODO: RTL */ - border-image-source: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAB3CAMAAAA93DCxAAAAM1BMVEUAAAAAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACin91XAAAAEXRSTlMzAAAvLhsCKBgyARAeDyIRFxtQtTsAAAA/SURBVHhe7ci3AYAAEAJA8YM57D+thY2wglx5w5+ZmZktGqExaewah0SsEvPIkS2xgaPAcYKjQJEXvhF3440HSAQAwP9T2mwAAAAASUVORK5CYII="); - border-image-slice: 14 14 14 0 fill; - border-image-width: 1 1 1 0; - padding: 14px; - margin: -14px; - } - - .popup-button:only-child:active { - border-image-source: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAB4CAMAAACkeQBcAAAAPFBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQLyYwAAAAFHRSTlMzAC8bKAEuAjIeDxAXGCIRDSktGtImyaoAAABzSURBVHhe7c5LDsIwEATR6rGdkH+A+9+VRUQUCWx2rPptp0Zq/szMzMzMzMxuv85BU5Bpygw0DYw0jZSgIQpaaFiESkdV1wtpomqSkPSkIukItPLVqnegVPk/A22Pj32broH6ObiIudcBnfaU7wD3nHadXi1ZAc/vLQEmAAAAAElFTkSuQmCC"); - border-image-slice: 14 14 14 14 fill; - border-image-width: 1 1 1 1; - padding: 14px; - margin: -14px; - } diff --git a/cef/resources/blackberry/selectControlBlackBerry.css b/cef/resources/blackberry/selectControlBlackBerry.css deleted file mode 100644 index 5aaf1d75d..000000000 --- a/cef/resources/blackberry/selectControlBlackBerry.css +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) Research In Motion Limited 2012. All rights reserved. - */ - -.select-area { - overflow-x: hidden; - overflow-y: auto; - white-space: nowrap; - - background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAtUAAAANCAYAAABmQZIAAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDowODgwMTE3NDA3MjA2ODExOERCQkU3QjZERTFCNzVGNyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxQzIwQ0ZFQTM0ODYxMUUxQkI0RkE0ODBENzFGMEVDRSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxQzIwQ0ZFOTM0ODYxMUUxQkI0RkE0ODBENzFGMEVDRSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjA4ODAxMTc0MDcyMDY4MTE4REJCRTdCNkRFMUI3NUY3IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjA4ODAxMTc0MDcyMDY4MTE4REJCRTdCNkRFMUI3NUY3Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+YZtOWQAAA25JREFUeNrsnetuwyAMhYPH3v+FUzNV2qSpSsAXTCA550eltingC/BBaZpKKRsEQRAEQRAEQXbl90NKCZ6AtCK4AIIgCLqxGC6ApHpvUueJweyOybwaiGJAQV5AEITxGlp3zOYH+H0aGzOSFkC0aH5ggIYgCAJUw9f++QW5Mxk00UWJACCCbfAzBEEQBD13MUOBZQ+Daqo854PXSGgECZ3EHSClhxMJUDQNGEpjwQ/xBxYHEDR4UoWtqnGAJ/I7B9m4Sj5wcB708C93iG0LzF1+yA4ja89J6CRyJGsO7OhXl7tih50FqiW/uo2+5U0yTCx3AOo7QzW+Hr33wml/WGw4cBzU3PmgLArVd2snT9Zu7Y60Bdg5wo6s6KQaAKZGA+hgImbl4NBjcI88M+xpX+qQTLVvBvJA+1jp9zvvIj+tXsAkFhfQ9b7jG9dHwoUSDbBFstt7BnSa+b0sEqNdMO+zsn0S3uGDa3PD5hZ/iv2VlclKjQT5hHDa6kdBtFBNjo6WOnRW6tTZo8obWdaXsKMnZ/0c4AO6sIxRcLYKBCbjhOG9D2hxtvOpKoN8Zq1n9j9e4MH1WHflWAiDI2y1zgGszIujfH1dHF8O+gx3KLNVhoQRekH11oBq+rfoOdpc3H9fJ2GfYi1UHwExVaA6VyCUGkCejFBLgUCsKSM5wKYHeFvgiTpMftT5urPrI6C6ByDNBtW9y70KIkf9HgLHtuJBjwf5cvRObFkgBjNAdQnwjfWcLg+ISxG0m531eICZHTHjDj7dFfFr1cdKYOcKcH9Ct8vO3BjAqALVR5CdK1CdKu9twvdIcM1XI9k8MGg9ApMcIG2dqNNJh/k878sVX7LCxl5wNgJMrtypThPbZC0vdZxUpf7xTtgR596fANWaRU9xxicK3rz5OvuZ1lmOB8x0TrcYy2RhH2jB2CdUF4e9WrCO2iHWxvdbEZddEJfWcY4z7uKTz1MFumscyTUIriUENwDsDFrZCGzWFdneaONrIOhsFbD1DBTWHe6/WLwOfGKJUTK2IxLwJNdqvtJLg9o9G2Svenwkuu/2gvTZoLpc7NtIQJxlQTIKNCPqLpO0cfSOswSqJWW/OvGNNC4WP0o+w4780NSpOZ++V8p8bed3puPKAuqPlf7vrpMgHzi9/1YRgiAIgiAIgiC7fgQYALk6BVm+VKUFAAAAAElFTkSuQmCC") bottom no-repeat rgba(255, 255, 255, 0.5); - background-size: 100% auto; - border-top-left-radius: 10px; - border-top-right-radius: 10px; - border-image-source: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB0AAAAcCAYAAACdz7SqAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9wGBw8oKjYFm6wAAAMkSURBVEjHxZbBThtXFIa/MzaejAs2aZKqbnHsSunG6kOwiJF4A4RhA1ElVGXLgteIKhQasUoRD5CmEs6CR/Ciu7YuBksjFZTa4Ho8tmdOF7kzOIi2CZjkSEdjX8093/3/e2bmiqoSReOg4QD3gE8YX/wNHBeKBS8akAh6eHB41wCpVqv2k++f3G0cNKZb7dYkIO8B0ensdKdQLLQef/f4pFwu+2b8+H7x/kkMPWoc5YBpgEffPvqsWq0WVDUC6RXUCYCIaLlcbjzbevanGW/lC3lXDhuHGeDLs7MzeVh++MB13dtACPiABwxGwPp/IHOdABzABqxcLvfXq+qr36amphRoWoLcFoTKUuUL13WzBtICXgMdA+6Z9P8jo3s8M++1qTNwXTdbWarkBEGQTy0RSb/46YVdq9U+BwLgGGibBoiyA5y9Q3YuzGsDJ0BQq9VyL39+mRKRtCUibP2wdccAT83NXbPid1V5mVrP1OmYusHTrad3RISkiFCv1zNA39jRM78Ds7fhFRrJMjk089uAXa/XsyLiJkWEbrebMCvtmmvfNE14je6NoGr+9z3Pm4iVDgaDoWmgCBjB9IovhGjBYuoBDHzfT8RQY+XwmpZeBo5UxvXfQC1hBDi8hqX/FsHIdSiWYBmlo3aOE8iFumFsr4joiKXjhkYRAipyrlRvGBjXH20kvUF736o/qvSDxUeEWh8YGj0yqVTq4jdx3GEBTE5OSmxvPp9H35xbrEuaahwpqqrFYvG8kebn5yOFzg0pdQDK5fK50tXVVQBVVQdIjhmYVNU0oMvLy7HSbqlU6q2vr6cMOauqto4nbFXNArqxsWGXSqWeiHTF87yMiHwVhuHMysrK6e7urmf2oWe+r4MrqJsA0sAtQBYWFpzt7e2MZVlNVf1DVBW/5+cSicQDEck8//F5d21t7dTzvOtvpOOwubmZWaospVW1HQTB7/Yt240P277v30skEt+ISLrZbA53dna8vb09f39/f/i+sNnZ2eTc3Jy9uLjozMzMJFW1GwTBL7ZtH791wgfo9/uOZVlfi0h+bC9d1aMwDH9NpVKxdf8AVVvibOaCYy8AAAAASUVORK5CYII="); - border-width: 12px 12px 0 12px; - border-image-slice: 12 12 12 12 fill; -} - -.select-area:last-child { - /* Nothing comes after us? Put the bottom border back and adjust the bottom shadow */ - border-bottom-width: 12px; - background-origin: border-box; -} - - .option { - overflow: hidden; - text-overflow: -blackberry-fade; - color: #262626; - text-shadow: rgba(0, 0, 0, 0.2) 0 -1px; - - box-sizing: border-box; - height: 99px; - - border: 2px solid rgba(0, 0, 0, 0.2); - border-bottom-width: 0; - - padding-left: 24px; - padding-top: 28px; - } - - .option:last-child, - .optgroup:last-child { - border-bottom-width: 2px; - } - - .selected { - background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAfCAYAAACPvW/2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDowOTgwMTE3NDA3MjA2ODExOERCQkU3QjZERTFCNzVGNyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo4QjlDOEZERjRFOEUxMUUxQTVCNEE5NzUyM0FFRjA5OSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo4QjlDOEZERTRFOEUxMUUxQTVCNEE5NzUyM0FFRjA5OSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkUzQUZFRkQwNDMyMDY4MTE5NDU3RDYyQTNCRTFFRDU2IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjA5ODAxMTc0MDcyMDY4MTE4REJCRTdCNkRFMUI3NUY3Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+Ei1rtAAAAxlJREFUeNrEl89rGkEUx1dXTWISPajxRzQhGkECIedCDvbQg9BbaQ6BQK8p9A9IDi2l2D8hJ9Eo/khMcmjVHJJLoYcWofaSXpJDyalJhIIUkYI/+n1DVyLurDHRdeHhzDgz++H73rx5q/H7/cIon/Pz846+ZoRANtgj2G/YF4A1aFDbarWEEdi6RqO5MBgMH/R6/Wf0v0MYBwHpRqDMi/Hx8YjZbBYBxQbq9fpypVKJoPlUR8RqwkxMTDAY6kjvFkVRmJqaCqmtEFPGZDKJciIYjcYaA1JJIaYMD4aelZWVExbUasLwJiwsLJTC4fB7NRTaIDchPsRms8mFiUQiW4D+NmwggolNT09z3UQw0WiUYE4pxocZ1BtjY2M9YWKxWAfMsBRiMEpu8nq9pd3d3S6YYWTqDWRfBsObQ8rE43EGMz8/36WGdhhu4k0gZRKJBBdGzmVLsGVYEfazX5jJyUlFN0kwc3Nz3DiRXEYSp7Ra7Q9IvoffC/Tf9uMmglFyUzKZZDAej6d1+z9ZhQDwCql7HRtL42KtVnsNoxLhZS9lsJarjM/nK6VSKQbjdrt7niAGZLFYnuHG7SBGDhFwG29Wq1WBA7UuwfBOKsGk02kGMzs7e6fjzILaZrPV5f7ECwW4YhPNHRmYBLmJtzHBZDKZvmDaMRQMBj+S5HKGAkrAppuYtyMVVxhLYEzkraGYkWBcLldLKQZlFdre3t4LhUJZ3iKKLYLC1BOCkdwkZ3Sa9vf32zD95g4WQ06n8xeed9Q+Pj5ek5tIUAj+JzqdTlCKmWw2y2Cw572ugHYecjgcZ1dXVwyqUCjIQgFI4J2mxcXFNgz2uvd91JEY7Xb72fX1tSIUD+bg4GALrjzFHg+6HLtuewmK2neBIpjDw8OBwHDLj9tQ+Xx+TS0YxfJjZmbm7ObmhrlPDopgjo6OGAzmDqyGUSzQJCicrHoul3veaDT0NB4IBIooId4MGoZ9Slut1p6TyuXy0uXl5eNisejCca6urq5+xfAnZPjmQwGwd/9A/xfSzWuC/QXIn0Ep0gWk8pdrz+efAAMAmYa9FmAD9lUAAAAASUVORK5CYII="), - -webkit-linear-gradient(top, #fafafa 0%, #dddddd 100%); - background-position: right 20px, 0% 0%; /* TODO: RTL */ - /* FIXME: the above should put the checkmark 20px from the right of the box, but webkit isn't supporting that part of CSS3 yet. So fake it */ - background-position: 97% 50%, 0% 0%; - background-repeat: no-repeat; - padding-right: 56px; /* this gets the overflow and fade to work. 36px for the image, about 20px for the right padding */ - } - - .optgroup { - /* need to do something with this */ - padding-left: 22px; - } - - .optgroup .option { - border-left-width: 0; /* TODO: RTL */ - } diff --git a/cef/resources/blackberry/selectControlBlackBerry.js b/cef/resources/blackberry/selectControlBlackBerry.js deleted file mode 100644 index 9d868a9fc..000000000 --- a/cef/resources/blackberry/selectControlBlackBerry.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (C) Research In Motion Limited, 2012. All rights reserved. - */ - -// Upon the user making a selection, I will call window.setValueAndClosePopup with a binary string where -// the character at index i being '1' means that the option at index i is selected. -(function (){ - - var selectOption = function (event) { - for (var option = document.getElementById('select-area').firstChild; option; option = option.nextSibling) { - if (option === event.target) { - if (option.className.indexOf('selected') === -1) { - option.className += ' selected'; - } - } else { - option.className = option.className.replace('selected', ''); - } - } - done(); - }; - - var toggleOption = function (event) { - if (event.target.className.indexOf('selected') === -1) { - event.target.className += ' selected'; - } else { - event.target.className = event.target.className.replace('selected', ''); - } - }; - - var done = function () { - var result = ''; - for (var option = document.getElementById('select-area').firstChild; option; option = option.nextSibling) { - if (option.className.indexOf('selected') === -1) { - result += '0'; - } else { - result += '1'; - } - } - window.setValueAndClosePopup(result, window.popUp); - }; - - /* multiple - a boolean - * labels - an array of strings - * enableds - an array of booleans. - * -I will assume that the HTML "disabled optgroups disable all options in the optgroup" hasn't been applied, - * so if the index corresponds to an optgroup, I will render all of its options as disabled - * itemTypes - an array of integers, 0 === option, 1 === optgroup, 2 === option in optgroup - * selecteds - an array of booleans - * buttonText - a string to use for the button presented when multiple is true. Like "OK" or "Done" or something. - */ - var show = function (multiple, labels, enableds, itemTypes, selecteds, buttonText) { - var i, - size = labels.length, - popup = document.createElement('div'), - select = document.createElement('div'); - - popup.className = 'popup-area'; - select.className = 'select-area'; - select.id = 'select-area'; - popup.appendChild(select); - - for (i = 0; i < size; i++) { - // TODO: handle itemTypes - var option = document.createElement('div'); - option.className = 'option' + (enableds[i] ? '' : ' disabled') + (selecteds[i] ? ' selected' : ''); - option.appendChild(document.createTextNode(labels[i])); - if (!multiple) { - option.addEventListener('click', selectOption); - } else if (enableds[i]) { - option.addEventListener('click', toggleOption); - } - - select.appendChild(option); - } - - if (multiple) { - var okButton = document.createElement('button'), - buttons = document.createElement('div'); - buttons.className = 'popup-buttons'; - okButton.className = 'popup-button'; - okButton.addEventListener('click', done); - okButton.appendChild(document.createTextNode(buttonText)); - buttons.appendChild(okButton); - popup.appendChild(buttons); - } - - document.body.appendChild(popup); - }; - - window.select = window.select || {}; - window.select.show = show; -}()); diff --git a/cef/resources/bn.lproj/locale.pak b/cef/resources/bn.lproj/locale.pak deleted file mode 100644 index c1b5f29e9..000000000 Binary files a/cef/resources/bn.lproj/locale.pak and /dev/null differ diff --git a/cef/resources/ca.lproj/locale.pak b/cef/resources/ca.lproj/locale.pak deleted file mode 100644 index 25facf952..000000000 Binary files a/cef/resources/ca.lproj/locale.pak and /dev/null differ diff --git a/cef/resources/calendarPicker.css b/cef/resources/calendarPicker.css deleted file mode 100644 index eef0b106d..000000000 --- a/cef/resources/calendarPicker.css +++ /dev/null @@ -1,177 +0,0 @@ -/* - * Copyright (C) 2012 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -body { - -webkit-user-select: none; - background-color: white; - font: -webkit-small-control; - margin: 0; - overflow: hidden; -} - -.no-focus-ring :focus { - outline: none; -} - -#main { - background-color: white; - border: solid 1px #8899aa; - box-shadow: inset 2px 2px 2px white, - inset -2px -2px 1px rgba(0,0,0,0.1); - padding: 6px; - whitespace: nowrap; - /* width and opacity are reset in the JS code. */ - width: 500px; - opacity: 0; -} - -.year-month-area { -} - -.year-month-upper { - /* display:-webkit-box; is added in the JS code. */ -} - -.year-selector { - text-align: right; - width: 6em; -} - -.month-selector-box { - display: inline-block; - text-align: center; - -webkit-box-flex: 2; -} - -.month-selector { - background-color: white; - cursor: pointer; - display: inline-block; - padding: 3px 6px 3px 6px; -} -.month-selector:after { - content: " ▼"; - font-size: smaller; -} - -.month-selector-popup { - display: none; - outline: none; - z-index: 2; -} - -.month-selector-wall { - display: none; - height: 100%; - left: 0px; - position: absolute; - top: 0px; - width: 100%; -} - -.year-month-button-left { - display: inline-block; -} - -.year-month-button-right { - display: inline-block; -} - -.days-area-container { - background-color: white; - border: solid 1px black; - margin-bottom: 4px; - margin-top: 4px; - overflow: hidden; -} - -.days-area { /* */ - background-color: white; - border-collapse: separate; - border-spacing: 0px; - font: -webkit-small-control; - /* table-layout:fixed and width:100% are added in the JS code. */ -} - -.day-label { /*
*/ - -webkit-box-sizing: border-box; - background-color: #e3e9ff; - border-left-color: #f0f4ff; - border-top-color: #f0f4ff; - border: solid 1px #d0d4f0; - color: #20c; - font-weight: normal; - text-align: center; -} - -.day { /* */ - padding: 1px; - text-align: center; - background-color: white; - border: 1px solid white; - -webkit-box-sizing: border-box; -} - -.available { - cursor: default; - font-weight: 700; - background-color: white; - border: 1px solid white; - border-radius: 5px; - -webkit-transition: all 0.2s ease; -} - -.not-this-month { - color: graytext; - font-weight: 400; - text-shadow: none; -} - -.available.day-selected { - background-color: highlight; - color: highlighttext; - text-shadow: none; -} - -.unavailable { - cursor: default; - color: graytext; - background-color: #eee; - border: 1px solid #eee; - -webkit-transition: border-color 0.2s ease; -} - -.unavailable.day-selected { - border: 1px solid highlight; -} - -.cancel-button { - float: right; -} diff --git a/cef/resources/calendarPicker.js b/cef/resources/calendarPicker.js deleted file mode 100644 index 4a7ef06ac..000000000 --- a/cef/resources/calendarPicker.js +++ /dev/null @@ -1,1128 +0,0 @@ -"use strict"; -/* - * Copyright (C) 2012 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -// FIXME: -// - Touch event - -/** - * CSS class names. - * - * @enum {string} - */ -var ClassNames = { - Available: "available", - CancelButton: "cancel-button", - ClearButton: "clear-button", - Day: "day", - DayLabel: "day-label", - DayLabelContainer: "day-label-container", - DaysArea: "days-area", - DaysAreaContainer: "days-area-container", - MonthSelector: "month-selector", - MonthSelectorBox: "month-selector-box", - MonthSelectorPopup: "month-selector-popup", - MonthSelectorWall: "month-selector-wall", - NoFocusRing: "no-focus-ring", - NotThisMonth: "not-this-month", - Selected: "day-selected", - TodayButton: "today-button", - TodayClearArea: "today-clear-area", - Unavailable: "unavailable", - WeekContainer: "week-container", - YearMonthArea: "year-month-area", - YearMonthButton: "year-month-button", - YearMonthButtonLeft: "year-month-button-left", - YearMonthButtonRight: "year-month-button-right", - YearMonthUpper: "year-month-upper" -}; - -/** - * @type {Object} - */ -var global = { - argumentsReceived: false, - hadKeyEvent: false, - params: null -}; - -// ---------------------------------------------------------------- -// Utility functions - -/** - * @param {!string} id - */ -function $(id) { - return document.getElementById(id); -} - -function bind(func, context) { - return function() { - return func.apply(context, arguments); - }; -} - -/** - * @param {!string} tagName - * @param {string=} opt_class - * @param {string=} opt_text - * @return {!Element} - */ -function createElement(tagName, opt_class, opt_text) { - var element = document.createElement(tagName); - if (opt_class) - element.setAttribute("class", opt_class); - if (opt_text) - element.appendChild(document.createTextNode(opt_text)); - return element; -} - -/** - * @return {!string} lowercase locale name. e.g. "en-us" - */ -function getLocale() { - return (global.params.locale || "en-us").toLowerCase(); -} - -/** - * @return {!string} lowercase language code. e.g. "en" - */ -function getLanguage() { - var locale = getLocale(); - var result = locale.match(/^([a-z]+)/); - if (!result) - return "en"; - return result[1]; -} - -/* - * @const - * @type {number} - */ -var ImperialEraLimit = 2087; - -/** - * @param {!number} year - * @param {!number} month - * @return {!string} - */ -function formatJapaneseImperialEra(year, month) { - // We don't show an imperial era if it is greater than 99 becase of space - // limitation. - if (year > ImperialEraLimit) - return ""; - if (year > 1989) - return "(平成" + (year - 1988) + "年)"; - if (year == 1989) - return "(平成元年)"; - if (year >= 1927) - return "(昭和" + (year - 1925) + "年)"; - if (year > 1912) - return "(大正" + (year - 1911) + "年)"; - if (year == 1912 && month >= 7) - return "(大正元年)"; - if (year > 1868) - return "(明治" + (year - 1867) + "年)"; - if (year == 1868) - return "(明治元年)"; - return ""; -} - -/** - * @param {!number} year - * @param {!number} month - * @return {!string} - */ -function formatYearMonth(year, month) { - // FIXME: Need localized number? - var yearString = String(year); - var monthString = global.params.monthLabels[month]; - switch (getLanguage()) { - case "eu": - case "fil": - case "lt": - case "ml": - case "mt": - case "tl": - case "ur": - return yearString + " " + monthString; - case "hu": - return yearString + ". " + monthString; - case "ja": - return yearString + "年" + formatJapaneseImperialEra(year, month) + " " + monthString; - case "zh": - return yearString + "年" + monthString; - case "ko": - return yearString + "년 " + monthString; - case "lv": - return yearString + ". g. " + monthString; - case "pt": - return monthString + " de " + yearString; - case "sr": - return monthString + ". " + yearString; - default: - return monthString + " " + yearString; - } -} - -/** - * @param {string=} opt_current - * @return {!Date} - */ -function parseDateString(opt_current) { - if (opt_current) { - var result = opt_current.match(/(\d+)-(\d+)-(\d+)/); - if (result) - return new Date(Date.UTC(Number(result[1]), Number(result[2]) - 1, Number(result[3]))); - } - var now = new Date(); - // Create UTC date with same numbers as local date. - return new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())); -} - -/** - * @param {!number} year - * @param {!number} month - * @param {!number} day - * @return {!string} - */ -function serializeDate(year, month, day) { - var yearString = String(year); - if (yearString.length < 4) - yearString = ("000" + yearString).substr(-4, 4); - return yearString + "-" + ("0" + (month + 1)).substr(-2, 2) + "-" + ("0" + day).substr(-2, 2); -} - -// ---------------------------------------------------------------- -// Initialization - -/** - * @param {Event} event - */ -function handleMessage(event) { - if (global.argumentsReceived) - return; - global.argumentsReceived = true; - initialize(JSON.parse(event.data)); -} - -function handleArgumentsTimeout() { - if (global.argumentsReceived) - return; - var args = { - monthLabels : ["m1", "m2", "m3", "m4", "m5", "m6", - "m7", "m8", "m9", "m10", "m11", "m12"], - dayLabels : ["d1", "d2", "d3", "d4", "d5", "d6", "d7"], - todayLabel : "Today", - clearLabel : "Clear", - cancelLabel : "Cancel", - currentValue : "", - weekStartDay : 0, - step : 1 - }; - initialize(args); -} - -/** - * @param {!Object} args - * @return {?string} An error message, or null if the argument has no errors. - */ -function validateArguments(args) { - if (!args.monthLabels) - return "No monthLabels."; - if (args.monthLabels.length != 12) - return "monthLabels is not an array with 12 elements."; - if (!args.dayLabels) - return "No dayLabels."; - if (args.dayLabels.length != 7) - return "dayLabels is not an array with 7 elements."; - if (!args.clearLabel) - return "No clearLabel."; - if (!args.todayLabel) - return "No todayLabel."; - if (args.weekStartDay) { - if (args.weekStartDay < 0 || args.weekStartDay > 6) - return "Invalid weekStartDay: " + args.weekStartDay; - } - return null; -} - -/** - * @param {!Object} args - */ -function initialize(args) { - var main = $("main"); - main.classList.add(ClassNames.NoFocusRing); - - var errorString = validateArguments(args); - if (errorString) - main.textContent = "Internal error: " + errorString; - else { - global.params = args; - checkLimits(); - layout(); - - var initialDate = parseDateString(args.currentValue); - if (initialDate < global.minimumDate) - initialDate = global.minimumDate; - else if (initialDate > global.maximumDate) - initialDate = global.maximumDate; - global.daysTable.selectDate(initialDate); - - setTimeout(fixWindowSize, 0); - } -} - -function fixWindowSize() { - var yearMonthRightElement = document.getElementsByClassName(ClassNames.YearMonthButtonRight)[0]; - var daysAreaElement = document.getElementsByClassName(ClassNames.DaysArea)[0]; - var headers = daysAreaElement.getElementsByClassName(ClassNames.DayLabel); - var maxCellWidth = 0; - for (var i = 0; i < headers.length; ++i) { - if (maxCellWidth < headers[i].offsetWidth) - maxCellWidth = headers[i].offsetWidth; - } - var DaysAreaContainerBorder = 1; - var maxRight = Math.max(yearMonthRightElement.offsetLeft + yearMonthRightElement.offsetWidth, - daysAreaElement.offsetLeft + maxCellWidth * 7 + DaysAreaContainerBorder); - var MainPadding = 6; - var MainBorder = 1; - var desiredBodyWidth = maxRight + MainPadding + MainBorder; - - var main = $("main"); - var mainHeight = main.offsetHeight; - main.style.width = "auto"; - daysAreaElement.style.width = "100%"; - daysAreaElement.style.tableLayout = "fixed"; - document.getElementsByClassName(ClassNames.YearMonthUpper)[0].style.display = "-webkit-box"; - document.getElementsByClassName(ClassNames.MonthSelectorBox)[0].style.display = "block"; - main.style.webkitTransition = "opacity 0.1s ease"; - main.style.opacity = "1"; - if (window.frameElement) { - window.frameElement.style.width = desiredBodyWidth + "px"; - window.frameElement.style.height = mainHeight + "px"; - } else { - window.resizeTo(desiredBodyWidth, mainHeight); - } -} - -function checkLimits() { - // Hard limits of type=date. See WebCore/platform/DateComponents.h. - global.minimumDate = new Date(-62135596800000.0); - global.maximumDate = new Date(8640000000000000.0); - // See WebCore/html/DateInputType.cpp. - global.step = 86400000; - - if (global.params.min) { - // We assume params.min is a valid date. - global.minimumDate = parseDateString(global.params.min); - } - if (global.params.max) { - // We assume params.max is a valid date. - global.maximumDate = parseDateString(global.params.max); - } - if (global.params.step) - global.step *= global.params.step; -} - -function layout() { - if (global.params.isRTL) - document.body.dir = "rtl"; - var main = $("main"); - var params = global.params; - main.removeChild(main.firstChild); - document.body.addEventListener("keydown", handleGlobalKey, false); - - global.yearMonthController = new YearMonthController(); - global.yearMonthController.attachTo(main); - global.daysTable = new DaysTable(); - global.daysTable.attachTo(main); - layoutButtons(main); -} - -/** - * @param {Element} main - */ -function layoutButtons(main) { - var container = createElement("div", ClassNames.TodayClearArea); - global.today = createElement("input", ClassNames.TodayButton); - global.today.type = "button"; - global.today.value = global.params.todayLabel; - global.today.addEventListener("click", handleToday, false); - container.appendChild(global.today); - global.clear = null; - if (!global.params.required) { - global.clear = createElement("input", ClassNames.ClearButton); - global.clear.type = "button"; - global.clear.value = global.params.clearLabel; - global.clear.addEventListener("click", handleClear, false); - container.appendChild(global.clear); - } - main.appendChild(container); - - global.lastFocusableControl = global.clear || global.today; -} - -// ---------------------------------------------------------------- - -/** - * @constructor - */ -function YearMonthController() { - /** - * @type {!number} - */ - this._currentYear = -1; - /** - * @type {!number} - */ - this._currentMonth = -1; -} - -/** - * @param {!Element} main - */ -YearMonthController.prototype.attachTo = function(main) { - var outerContainer = createElement("div", ClassNames.YearMonthArea); - - var innerContainer = createElement("div", ClassNames.YearMonthUpper); - outerContainer.appendChild(innerContainer); - - this._attachLeftButtonsTo(innerContainer); - - var box = createElement("div", ClassNames.MonthSelectorBox); - innerContainer.appendChild(box); - // We can't use