Commit 547dbf57 authored by mad@chromium.org's avatar mad@chromium.org

Re-enable print and reload for instant extended NTP which now supports it properly.

BUG=165557, 162318

Review URL: https://chromiumcodereview.appspot.com/12250028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182415 0039d316-1c4b-4281-b951-d872f2087c98
parent 38c3eb43
...@@ -48,8 +48,6 @@ ...@@ -48,8 +48,6 @@
#include "chrome/browser/ui/find_bar/find_tab_helper.h" #include "chrome/browser/ui/find_bar/find_tab_helper.h"
#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
#include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/browser/ui/omnibox/location_bar.h"
#include "chrome/browser/ui/search/search.h"
#include "chrome/browser/ui/search/search_model.h"
#include "chrome/browser/ui/status_bubble.h" #include "chrome/browser/ui/status_bubble.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/web_contents_modal_dialog_manager.h" #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
...@@ -193,12 +191,6 @@ bool PrintPreviewShowing(const Browser* browser) { ...@@ -193,12 +191,6 @@ bool PrintPreviewShowing(const Browser* browser) {
controller->is_creating_print_preview_dialog()); controller->is_creating_print_preview_dialog());
} }
bool IsNTPModeForInstantExtendedAPI(const Browser* browser) {
return browser->search_model() &&
search::IsInstantExtendedAPIEnabled(browser->profile()) &&
browser->search_model()->mode().is_ntp();
}
} // namespace } // namespace
bool IsCommandEnabled(Browser* browser, int command) { bool IsCommandEnabled(Browser* browser, int command) {
...@@ -387,7 +379,7 @@ void ReloadIgnoringCache(Browser* browser, WindowOpenDisposition disposition) { ...@@ -387,7 +379,7 @@ void ReloadIgnoringCache(Browser* browser, WindowOpenDisposition disposition) {
} }
bool CanReload(const Browser* browser) { bool CanReload(const Browser* browser) {
return !browser->is_devtools() && !IsNTPModeForInstantExtendedAPI(browser); return !browser->is_devtools();
} }
void Home(Browser* browser, WindowOpenDisposition disposition) { void Home(Browser* browser, WindowOpenDisposition disposition) {
...@@ -735,11 +727,9 @@ void Print(Browser* browser) { ...@@ -735,11 +727,9 @@ void Print(Browser* browser) {
bool CanPrint(const Browser* browser) { bool CanPrint(const Browser* browser) {
// Do not print when printing is disabled via pref or policy. // Do not print when printing is disabled via pref or policy.
// Do not print when a constrained window is showing. It's confusing. // Do not print when a constrained window is showing. It's confusing.
// Do not print if instant extended API is enabled and mode is NTP.
return browser->profile()->GetPrefs()->GetBoolean(prefs::kPrintingEnabled) && return browser->profile()->GetPrefs()->GetBoolean(prefs::kPrintingEnabled) &&
!(IsShowingWebContentsModalDialog(browser) || !(IsShowingWebContentsModalDialog(browser) ||
GetContentRestrictions(browser) & content::CONTENT_RESTRICTION_PRINT || GetContentRestrictions(browser) & content::CONTENT_RESTRICTION_PRINT);
IsNTPModeForInstantExtendedAPI(browser));
} }
void AdvancedPrint(Browser* browser) { void AdvancedPrint(Browser* browser) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment