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

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

Issue 9479008: Re-factor location bar/toolbar code to get rid of the browser dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: call right overloaded method Created 8 years, 9 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_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 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #import <Cocoa/Cocoa.h> 11 #import <Cocoa/Cocoa.h>
12 12
13 #include "base/memory/scoped_nsobject.h" 13 #include "base/memory/scoped_nsobject.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 "chrome/browser/autocomplete/autocomplete_edit.h" 17 #include "chrome/browser/autocomplete/autocomplete_edit.h"
18 #include "chrome/browser/extensions/image_loading_tracker.h" 18 #include "chrome/browser/extensions/image_loading_tracker.h"
19 #include "chrome/browser/prefs/pref_member.h" 19 #include "chrome/browser/prefs/pref_member.h"
20 #include "chrome/browser/ui/browser.h"
20 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" 21 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
21 #include "chrome/browser/ui/omnibox/location_bar.h" 22 #include "chrome/browser/ui/omnibox/location_bar.h"
22 #include "chrome/browser/ui/toolbar/toolbar_model.h" 23 #include "chrome/browser/ui/toolbar/toolbar_model.h"
23 #include "chrome/common/content_settings_types.h" 24 #include "chrome/common/content_settings_types.h"
24 25
25 @class AutocompleteTextField; 26 @class AutocompleteTextField;
26 class CommandUpdater; 27 class CommandUpdater;
27 class ContentSettingDecoration; 28 class ContentSettingDecoration;
28 class EVBubbleDecoration; 29 class EVBubbleDecoration;
29 class KeywordHintDecoration; 30 class KeywordHintDecoration;
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 // Used to schedule a task for the first run info bubble. 225 // Used to schedule a task for the first run info bubble.
225 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; 226 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;
226 227
227 // Used to change the visibility of the star decoration. 228 // Used to change the visibility of the star decoration.
228 BooleanPrefMember edit_bookmarks_enabled_; 229 BooleanPrefMember edit_bookmarks_enabled_;
229 230
230 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); 231 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
231 }; 232 };
232 233
233 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ 234 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698