diff options
| author | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-11 21:24:01 +0000 |
|---|---|---|
| committer | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-11 21:24:01 +0000 |
| commit | 07c83fd88c98778035fb5b5102fa4983b39fa860 (patch) | |
| tree | 3b22f88e3bf39fa6f99047faaae9de3a4fb0c246 | |
| parent | 2cfda0ee8752e6b0c5aeb588253d61e74a6ee3d0 (diff) | |
| download | chromium_src-07c83fd88c98778035fb5b5102fa4983b39fa860.zip chromium_src-07c83fd88c98778035fb5b5102fa4983b39fa860.tar.gz chromium_src-07c83fd88c98778035fb5b5102fa4983b39fa860.tar.bz2 | |
Add splash appropriate for Linux official builds.
Review URL: http://codereview.chromium.org/115147
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15783 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_about_handler.cc | 13 | ||||
| -rw-r--r-- | chrome/browser/browser_resources.grd | 3 | ||||
| -rw-r--r-- | chrome/browser/resources/linux-splash-chrome.html | 71 |
3 files changed, 84 insertions, 3 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 96fa213..6c46f18 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -152,9 +152,18 @@ std::string AboutHistograms(const std::string& query) { } std::string AboutLinuxSplash() { + int resource_id = IDR_LINUX_SPLASH_HTML_CHROMIUM; + scoped_ptr<FileVersionInfo> version_info( + FileVersionInfo::CreateFileVersionInfoForCurrentModule()); + if (version_info == NULL) { + DLOG(ERROR) << "Unable to create FileVersionInfo object"; + } else { + if (version_info->is_official_build()) { + resource_id = IDR_LINUX_SPLASH_HTML_CHROME; + } + } static const std::string linux_splash_html = - ResourceBundle::GetSharedInstance().GetDataResource( - IDR_LINUX_SPLASH_HTML); + ResourceBundle::GetSharedInstance().GetDataResource(resource_id); return linux_splash_html; } diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 61af3bc..f0f36df6 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -30,7 +30,8 @@ without changes to the corresponding grd file. --> <include name="IDR_EXTENSIONS_UI_HTML" file="resources\extensions_ui.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_EXTENSIONS_TOOLSTRIP_CSS" file="resources\extensions_toolstrip.css" flattenhtml="true" type="BINDATA" /> <if expr="os == 'linux2'"> - <include name="IDR_LINUX_SPLASH_HTML" file="resources\linux-splash.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_LINUX_SPLASH_HTML_CHROMIUM" file="resources\linux-splash.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_LINUX_SPLASH_HTML_CHROME" file="resources\linux-splash-chrome.html" flattenhtml="true" type="BINDATA" /> </if> </includes> </release> diff --git a/chrome/browser/resources/linux-splash-chrome.html b/chrome/browser/resources/linux-splash-chrome.html new file mode 100644 index 0000000..c40e073 --- /dev/null +++ b/chrome/browser/resources/linux-splash-chrome.html @@ -0,0 +1,71 @@ +<!DOCTYPE html> +<html lang="en-US"> + <head> + <title>Google Chrome Alpha Warning</title> + <style> + body { + font-family: sans-serif; + font-size: 0.8em; + margin: 2em 4em; + } + + div.text { + max-width: 60ex; + } + + div.stopcorner { + border-style: solid; + border-color: red white; + width: 50px; + } + </style> + </head> + <body> + <center> + <div> + <!-- Stop sign using CSS hacks! For an octagon with sides of length + 50px, the corners must be sqrt(1/2)*50 = 35 px. --> + <div class='stopcorner' style='border-width: 0px 35px 35px; width:50px'> </div> + <div style='display:table-cell; + background: red; color: white; + width: 120px; height: 50px; + text-align: center; vertical-align: middle; + font-size: 40px; font-family: sans-serif'>STOP</div> + <div class='stopcorner' style='border-width: 35px 35px 0px; width:50px'> </div> + </div> + <h1>This browser is not ready yet!</h1> + </center> + + <div class="text"> + + <p>This is a <i>pre-alpha</i> build of Google Chrome on Linux. It is woefully + incomplete. No work has been done on performance yet, much of the UI is + missing, plugins don't work, and many more bugs remain.</p> + + <p><a href="http://code.google.com/chromium/">Chromium</a> is an open + source browser project. <a href="http://www.google.com/chrome">Google + Chrome</a> is a browser from Google, based on the Chromium project.</p> + + <h3>Don't file bugs without doing the work</h3> + + <p>Every minute spent triaging and de-duplicating bugs is a minute spent + not fixing them. If you have a good bug report (e.g. includes a + stack trace or a reduced test case), first verify it exists in the <a + href="http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/">latest + build</a>, then <a + href="http://code.google.com/p/chromium/issues/list?can=1&q=os:linux"> + verify it hasn't been filed already</a>, then <a + href="http://code.google.com/p/chromium/issues/entry?template=Defect%20on%20Linux">file + your bug using the Linux-specific template</a>.</p> + + <h3>How to help</h3> + + <p>Chromium is an open source project, and you are welcome to help out. We + have <a href="http://dev.chromium.org/">documentation for developers</a> as + well as mailing lists and an IRC channel.</p> + + </div> + + <p></p> + </body> +</html> |