diff options
| -rw-r--r-- | chrome/browser/browser.cc | 10 | ||||
| -rw-r--r-- | chrome/browser/browser_about_handler.cc | 23 | ||||
| -rw-r--r-- | chrome/browser/browser_init.cc | 24 | ||||
| -rw-r--r-- | chrome/browser/browser_resources.grd | 4 | ||||
| -rw-r--r-- | chrome/browser/resources/linux-splash-chrome.html | 74 | ||||
| -rw-r--r-- | chrome/browser/resources/linux-splash.html | 72 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 4 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 4 |
8 files changed, 0 insertions, 215 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index a8e5469..1a037c5 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -2264,17 +2264,7 @@ void Browser::InitCommandState() { // Page-related commands command_updater_.UpdateCommandEnabled(IDC_CLOSE_POPUPS, true); - // TODO(estade): remove these ifdefs when printing is fully supported. -#if defined(OS_LINUX) -#if defined(TOOLKIT_GTK) - command_updater_.UpdateCommandEnabled(IDC_PRINT, - CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePrinting)); -#elif defined(TOOLKIT_VIEWS) - command_updater_.UpdateCommandEnabled(IDC_PRINT, false); -#endif -#else // !defined(OS_LINUX) command_updater_.UpdateCommandEnabled(IDC_PRINT, true); -#endif command_updater_.UpdateCommandEnabled(IDC_ENCODING_AUTO_DETECT, true); command_updater_.UpdateCommandEnabled(IDC_ENCODING_UTF8, true); command_updater_.UpdateCommandEnabled(IDC_ENCODING_UTF16LE, true); diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 3e4baf3..9331606 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -75,7 +75,6 @@ const char kStatsPath[] = "stats"; const char kVersionPath[] = "version"; const char kCreditsPath[] = "credits"; const char kTermsPath[] = "terms"; -const char kLinuxSplash[] = "linux-splash"; const char kSyncPath[] = "sync"; // Points to the singleton AboutSource object, if any. @@ -195,23 +194,6 @@ std::string AboutHistograms(const std::string& query) { return data; } -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(resource_id); - - return linux_splash_html; -} - void AboutMemory(AboutSource* source, int request_id) { // The AboutMemoryHandler cleans itself up. new AboutMemoryHandler(source, request_id); @@ -585,11 +567,6 @@ void AboutSource::StartDataRequest(const std::string& path_raw, response = AboutSync(); #endif } -#if defined(OS_LINUX) - else if (path == kLinuxSplash) { - response = AboutLinuxSplash(); - } -#endif FinishDataRequest(response, request_id); } diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index 1f0f5b1..26e6db5 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -443,30 +443,6 @@ bool BrowserInit::LaunchWithProfile::Launch(Profile* profile, browser = BrowserList::GetLastActive(); OpenURLsInBrowser(browser, process_startup, urls_to_open); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(TOOLKIT_VIEWS) - // TODO(port): Remove ifdef when the Linux splash page is not needed. - const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess(); - // This can mess up UI tests, so only do it when UI tests aren't running. - if (!parsed_command_line.HasSwitch(switches::kHomePage) && - GetURLsFromCommandLine(profile_).empty()) { - Browser* browser = BrowserList::GetLastActive(); - if (browser) { - // Only show the splash page if it isn't already showing. - bool open_splash = true; - for (int i = 0; i < browser->tab_count(); ++i) { - if (browser->GetTabContentsAt(i)->GetURL().spec() == - "about:linux-splash") { - open_splash = false; - } - } - - if (open_splash) { - browser->OpenURL(GURL("about:linux-splash"), GURL(), - NEW_FOREGROUND_TAB, PageTransition::START_PAGE); - } - } - } -#endif // Check whether we are the default browser. if (process_startup && !command_line_.HasSwitch(switches::kNoDefaultBrowserCheck)) diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 5e63902..fc6d70f 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -45,10 +45,6 @@ without changes to the corresponding grd file. ek --> <include name="IDR_PRINT_TAB_HTML" file="resources\print_tab.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_PRINT_TAB_CSS" file="resources\print_tab.css" type="BINDATA" /> <include name="IDR_PRINT_TAB_JS" file="resources\print_tab.js" type="BINDATA" /> - <if expr="os == 'linux2'"> - <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> <include name="IDR_ABOUT_SYNC_HTML" file="sync\resources\about_sync.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.html" flattenhtml="true" type="BINDATA" /> diff --git a/chrome/browser/resources/linux-splash-chrome.html b/chrome/browser/resources/linux-splash-chrome.html deleted file mode 100644 index 6ea8589..0000000 --- a/chrome/browser/resources/linux-splash-chrome.html +++ /dev/null @@ -1,74 +0,0 @@ -<!DOCTYPE html> -<html lang="en-US"> - <head> - <title>Google Chrome Dev Build Warning</title> - <style> - body { - font-family: sans-serif; - font-size: 0.8em; - margin: 2em 4em; - } - - div.text { - max-width: 60ex; - } - - tt { - /* https://bugs.webkit.org/show_bug.cgi?id=19161 */ - font-size: 120%; - } - </style> - </head> - <body> - <center> - <h1>Google Chrome Dev Build</h1> - </center> - - <div class="text"> - - <p>This is an <i>in-progress</i> build of Google Chrome on Linux. - - <p>We are still working on it. Parts of the browser are - incomplete, poorly tuned and broken. User beware! - - <h3>‘Chromium’ <i>vs</i> ‘Google Chrome’</h3> - - <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>This is a build of Google Chrome, released by Google for testing. - - <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>. - - <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. - - <h3>Printing</h3> - - Basic printing support is now available with the --enable-printing flag. - There is no support for page preview, adjusting the margins, editing the - header/footer, etc. If you have bug reports, please file them, but be sure - to - <a href="http://code.google.com/p/chromium/issues/list?can=2&q=label:Printing#"> - search existing issues</a> first, because we know a lot of features are - missing. - - </div> - - <p></p> - </body> -</html> diff --git a/chrome/browser/resources/linux-splash.html b/chrome/browser/resources/linux-splash.html deleted file mode 100644 index 26a0361..0000000 --- a/chrome/browser/resources/linux-splash.html +++ /dev/null @@ -1,72 +0,0 @@ -<!DOCTYPE html> -<html lang="en-US"> - <head> - <title>Chromium Dev Build Warning</title> - <style> - body { - font-family: sans-serif; - font-size: 0.8em; - margin: 2em 4em; - } - - div.text { - max-width: 60ex; - } - - tt { - /* https://bugs.webkit.org/show_bug.cgi?id=19161 */ - font-size: 120%; - } - </style> - </head> - <body> - <center> - <h1>Chromium Dev Build</h1> - </center> - - <div class="text"> - - <p>This is an <i>in-progress</i> build of Chromium on Linux. - - <p>We are still working on it. Parts of the browser are - incomplete, poorly tuned and broken. User beware! - - <h3>‘Chromium’ <i>vs</i> ‘Google Chrome’</h3> - - <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. - - <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>. - - <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. - - <h3>Printing</h3> - - Basic printing support is now available with the --enable-printing flag. - There is no support for page preview, adjusting the margins, editing the - header/footer, etc. If you have bug reports, please file them, but be sure - to - <a href="http://code.google.com/p/chromium/issues/list?can=2&q=label:Printing#"> - search existing issues</a> first, because we know a lot of features are - missing. - - </div> - - <p></p> - </body> -</html> diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index e320f82..075a350 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -603,8 +603,4 @@ const wchar_t kExplicitlyAllowedPorts[] = L"explicitly-allowed-ports"; // is launched on the command line (e.g. by Selenium). Only needed on Mac. const wchar_t kActivateOnLaunch[] = L"activate-on-launch"; -#if defined(OS_LINUX) -const wchar_t kEnablePrinting[] = L"enable-printing"; -#endif - } // namespace switches diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 1d25d7c..f031399 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -245,10 +245,6 @@ extern const wchar_t kExplicitlyAllowedPorts[]; extern const wchar_t kActivateOnLaunch[]; -#if defined(OS_LINUX) -extern const wchar_t kEnablePrinting[]; -#endif - } // namespace switches #endif // CHROME_COMMON_CHROME_SWITCHES_H_ |