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

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
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_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ 6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #import <Cocoa/Cocoa.h> 10 #import <Cocoa/Cocoa.h>
11 #include <stddef.h> 11 #include <stddef.h>
12 12
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/scoped_vector.h" 15 #include "base/memory/scoped_vector.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "base/prefs/pref_member.h"
18 #include "chrome/browser/ui/browser.h" 17 #include "chrome/browser/ui/browser.h"
19 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" 18 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
20 #include "chrome/browser/ui/location_bar/location_bar.h" 19 #include "chrome/browser/ui/location_bar/location_bar.h"
21 #include "chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.h" 20 #include "chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.h"
22 #include "components/content_settings/core/common/content_settings_types.h" 21 #include "components/content_settings/core/common/content_settings_types.h"
22 #include "components/prefs/pref_member.h"
23 #include "components/ui/zoom/zoom_event_manager_observer.h" 23 #include "components/ui/zoom/zoom_event_manager_observer.h"
24 24
25 @class AutocompleteTextField; 25 @class AutocompleteTextField;
26 class CommandUpdater; 26 class CommandUpdater;
27 class ContentSettingDecoration; 27 class ContentSettingDecoration;
28 class EVBubbleDecoration; 28 class EVBubbleDecoration;
29 class KeywordHintDecoration; 29 class KeywordHintDecoration;
30 class LocationBarDecoration; 30 class LocationBarDecoration;
31 class LocationIconDecoration; 31 class LocationIconDecoration;
32 class ManagePasswordsDecoration; 32 class ManagePasswordsDecoration;
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 // Indicates whether or not the location bar is currently visible. 266 // Indicates whether or not the location bar is currently visible.
267 bool location_bar_visible_; 267 bool location_bar_visible_;
268 268
269 // Used to schedule a task for the first run info bubble. 269 // Used to schedule a task for the first run info bubble.
270 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; 270 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;
271 271
272 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); 272 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
273 }; 273 };
274 274
275 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ 275 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698