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

Side by Side Diff: chrome/browser/extensions/location_bar_controller.h

Issue 516633002: Stop showing page actions in the location bar with redesign enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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_EXTENSIONS_LOCATION_BAR_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_LOCATION_BAR_CONTROLLER_H_
6 #define CHROME_BROWSER_EXTENSIONS_LOCATION_BAR_CONTROLLER_H_ 6 #define CHROME_BROWSER_EXTENSIONS_LOCATION_BAR_CONTROLLER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 content::BrowserContext* browser_context, 45 content::BrowserContext* browser_context,
46 const Extension* extension, 46 const Extension* extension,
47 UnloadedExtensionInfo::Reason reason) OVERRIDE; 47 UnloadedExtensionInfo::Reason reason) OVERRIDE;
48 48
49 // The associated WebContents. 49 // The associated WebContents.
50 content::WebContents* web_contents_; 50 content::WebContents* web_contents_;
51 51
52 // The associated BrowserContext. 52 // The associated BrowserContext.
53 content::BrowserContext* browser_context_; 53 content::BrowserContext* browser_context_;
54 54
55 // Whether or not to show page actions in the location bar at all. (This is
56 // false with the toolbar redesign enabled.)
57 bool should_show_page_actions_;
58
55 // The ActiveScriptController, which could also add actions for extensions if 59 // The ActiveScriptController, which could also add actions for extensions if
56 // they have a pending script. 60 // they have a pending script.
57 scoped_ptr<ActiveScriptController> active_script_controller_; 61 scoped_ptr<ActiveScriptController> active_script_controller_;
58 62
59 ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver> 63 ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
60 extension_registry_observer_; 64 extension_registry_observer_;
61 65
62 DISALLOW_COPY_AND_ASSIGN(LocationBarController); 66 DISALLOW_COPY_AND_ASSIGN(LocationBarController);
63 }; 67 };
64 68
65 } // namespace extensions 69 } // namespace extensions
66 70
67 #endif // CHROME_BROWSER_EXTENSIONS_LOCATION_BAR_CONTROLLER_H_ 71 #endif // CHROME_BROWSER_EXTENSIONS_LOCATION_BAR_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698