Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Side by Side Diff: chrome/browser/ui/views/location_bar/zoom_bubble_view.h

Issue 420533002: zoom bubble: Close if anchor is clicked while bubble is showing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: test fixes Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/gtest_prod_util.h"
9 #include "base/timer/timer.h" 10 #include "base/timer/timer.h"
10 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" 11 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
11 #include "content/public/browser/notification_observer.h" 12 #include "content/public/browser/notification_observer.h"
12 #include "content/public/browser/notification_registrar.h" 13 #include "content/public/browser/notification_registrar.h"
13 #include "extensions/browser/extension_icon_image.h" 14 #include "extensions/browser/extension_icon_image.h"
14 #include "ui/views/bubble/bubble_delegate.h" 15 #include "ui/views/bubble/bubble_delegate.h"
15 #include "ui/views/controls/button/button.h" 16 #include "ui/views/controls/button/button.h"
16 #include "ui/views/controls/label.h" 17 #include "ui/views/controls/label.h"
17 18
18 class FullscreenController; 19 class FullscreenController;
(...skipping 24 matching lines...) Expand all
43 static void CloseBubble(); 44 static void CloseBubble();
44 45
45 // Whether the zoom bubble is currently showing. 46 // Whether the zoom bubble is currently showing.
46 static bool IsShowing(); 47 static bool IsShowing();
47 48
48 // Returns the zoom bubble if the zoom bubble is showing. Returns NULL 49 // Returns the zoom bubble if the zoom bubble is showing. Returns NULL
49 // otherwise. 50 // otherwise.
50 static const ZoomBubbleView* GetZoomBubbleForTest(); 51 static const ZoomBubbleView* GetZoomBubbleForTest();
51 52
52 private: 53 private:
54 FRIEND_TEST_ALL_PREFIXES(ZoomBubbleBrowserTest, ImmersiveFullscreen);
55
53 // Stores information about the extension that initiated the zoom change, if 56 // Stores information about the extension that initiated the zoom change, if
54 // any. 57 // any.
55 struct ZoomBubbleExtensionInfo { 58 struct ZoomBubbleExtensionInfo {
56 ZoomBubbleExtensionInfo(); 59 ZoomBubbleExtensionInfo();
57 ~ZoomBubbleExtensionInfo(); 60 ~ZoomBubbleExtensionInfo();
58 61
59 // The unique id of the extension, which is used to find the correct 62 // The unique id of the extension, which is used to find the correct
60 // extension after clicking on the image button in the zoom bubble. 63 // extension after clicking on the image button in the zoom bubble.
61 std::string id; 64 std::string id;
62 65
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 // Not owned. 159 // Not owned.
157 ImmersiveModeController* immersive_mode_controller_; 160 ImmersiveModeController* immersive_mode_controller_;
158 161
159 // Used to register for fullscreen change notifications. 162 // Used to register for fullscreen change notifications.
160 content::NotificationRegistrar registrar_; 163 content::NotificationRegistrar registrar_;
161 164
162 DISALLOW_COPY_AND_ASSIGN(ZoomBubbleView); 165 DISALLOW_COPY_AND_ASSIGN(ZoomBubbleView);
163 }; 166 };
164 167
165 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_ 168 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/bubble_icon_view.cc ('k') | chrome/browser/ui/views/location_bar/zoom_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698