| Index: chrome/browser/ui/zoom/zoom_controller.cc
|
| diff --git a/chrome/browser/ui/zoom/zoom_controller.cc b/chrome/browser/ui/zoom/zoom_controller.cc
|
| index 0e4db31c771ca8a4f0e3a31b87ec5f42376ff495..a2e8ce9376afbf83f5510f2cf92bb6c349d5d1d3 100644
|
| --- a/chrome/browser/ui/zoom/zoom_controller.cc
|
| +++ b/chrome/browser/ui/zoom/zoom_controller.cc
|
| @@ -27,6 +27,7 @@ DEFINE_WEB_CONTENTS_USER_DATA_KEY(ZoomController);
|
|
|
| ZoomController::ZoomController(content::WebContents* web_contents)
|
| : content::WebContentsObserver(web_contents),
|
| + can_show_bubble_(true),
|
| zoom_mode_(ZOOM_MODE_DEFAULT),
|
| zoom_level_(1.0),
|
| browser_context_(web_contents->GetBrowserContext()) {
|
| @@ -274,9 +275,9 @@ void ZoomController::UpdateState(const std::string& host) {
|
| }
|
| }
|
|
|
| - // The zoom bubble can be shown for all zoom changes where the host is
|
| - // not empty.
|
| - bool can_show_bubble = !host.empty();
|
| + // The zoom bubble should not be shown for zoom changes where the host is
|
| + // empty.
|
| + bool can_show_bubble = can_show_bubble_ && !host.empty();
|
|
|
| if (event_data_) {
|
| // For state changes initiated within the ZoomController, information about
|
|
|