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

Side by Side Diff: chrome/browser/ui/zoom/zoom_controller.h

Issue 11299014: [zoom bubble] Fix my stupidity and restore the proper host handling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: test Created 8 years, 1 month 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_ZOOM_ZOOM_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_ZOOM_ZOOM_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_ZOOM_ZOOM_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_ZOOM_ZOOM_CONTROLLER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/gtest_prod_util.h"
10 #include "base/prefs/public/pref_observer.h" 11 #include "base/prefs/public/pref_observer.h"
11 #include "chrome/browser/api/prefs/pref_member.h" 12 #include "chrome/browser/api/prefs/pref_member.h"
12 #include "content/public/browser/notification_observer.h" 13 #include "content/public/browser/notification_observer.h"
13 #include "content/public/browser/notification_registrar.h" 14 #include "content/public/browser/notification_registrar.h"
14 #include "content/public/browser/web_contents_observer.h" 15 #include "content/public/browser/web_contents_observer.h"
15 #include "content/public/browser/web_contents_user_data.h" 16 #include "content/public/browser/web_contents_user_data.h"
16 17
17 class ZoomObserver; 18 class ZoomObserver;
18 19
19 namespace content { 20 namespace content {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 int zoom_percent_; 67 int zoom_percent_;
67 68
68 content::NotificationRegistrar registrar_; 69 content::NotificationRegistrar registrar_;
69 70
70 // Used to access the default zoom level preference. 71 // Used to access the default zoom level preference.
71 DoublePrefMember default_zoom_level_; 72 DoublePrefMember default_zoom_level_;
72 73
73 // Observer receiving notifications on state changes. 74 // Observer receiving notifications on state changes.
74 ZoomObserver* observer_; 75 ZoomObserver* observer_;
75 76
77 FRIEND_TEST_ALL_PREFIXES(ZoomControllerTest, DidNavigateMainFrame);
78 FRIEND_TEST_ALL_PREFIXES(ZoomControllerTest, Observe);
79 FRIEND_TEST_ALL_PREFIXES(ZoomControllerTest, OnPreferenceChanged);
80
76 DISALLOW_COPY_AND_ASSIGN(ZoomController); 81 DISALLOW_COPY_AND_ASSIGN(ZoomController);
77 }; 82 };
78 83
79 #endif // CHROME_BROWSER_UI_ZOOM_ZOOM_CONTROLLER_H_ 84 #endif // CHROME_BROWSER_UI_ZOOM_ZOOM_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/zoom/zoom_controller.cc » ('j') | chrome/browser/ui/zoom/zoom_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698