diff options
| author | abodenha@chromium.org <abodenha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 19:24:21 +0000 |
|---|---|---|
| committer | abodenha@chromium.org <abodenha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 19:24:21 +0000 |
| commit | d11a4b41d90a2e393fa5908419cf3d97a7d3064b (patch) | |
| tree | 668b4f9f711906b4fc46249718366d23fa9ed88c /chrome | |
| parent | 93aaa7eda9d1d326655d2738765a151462ab9012 (diff) | |
| download | chromium_src-d11a4b41d90a2e393fa5908419cf3d97a7d3064b.zip chromium_src-d11a4b41d90a2e393fa5908419cf3d97a7d3064b.tar.gz chromium_src-d11a4b41d90a2e393fa5908419cf3d97a7d3064b.tar.bz2 | |
Revert 104411 - Disable print preview in incognito mode in chrome os.
The underlying issue with 99271 is fixed. Revert this change.
BUG=99271
TEST=Print preview should work in incognito in chrome os.
Review URL: http://codereview.chromium.org/8176006
R=dpapad@chromium.org
Review URL: http://codereview.chromium.org/8450006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108516 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/tab_contents/render_view_context_menu.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/ui/browser.cc | 6 |
2 files changed, 0 insertions, 13 deletions
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 15880ad..25c6389 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -1540,15 +1540,8 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) { source_tab_contents_); if (!tab_contents_wrapper) break; -#if defined(OS_CHROMEOS) - // Disable print preview in CHROMEOS in incognito mode until bug 99271 - // is fixed. - if (switches::IsPrintPreviewEnabled() && !profile_->IsOffTheRecord()) -#else if (switches::IsPrintPreviewEnabled()) -#endif tab_contents_wrapper->print_view_manager()->PrintPreviewNow(); - else tab_contents_wrapper->print_view_manager()->PrintNow(); } else { diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index f83cafd..4e9428f 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -1892,13 +1892,7 @@ void Browser::EmailPageLocation() { } void Browser::Print() { -#if defined(OS_CHROMEOS) - // Disable print preview in CHROMEOS in incognito mode until bug 99271 - // is fixed. - if (switches::IsPrintPreviewEnabled() && !profile_->IsOffTheRecord()) -#else if (switches::IsPrintPreviewEnabled()) -#endif GetSelectedTabContentsWrapper()->print_view_manager()->PrintPreviewNow(); else GetSelectedTabContentsWrapper()->print_view_manager()->PrintNow(); |