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

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: Latest CQ for Master 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 // The associated WebContents. 53 // The associated WebContents.
54 content::WebContents* web_contents_; 54 content::WebContents* web_contents_;
55 55
56 // The associated BrowserContext. 56 // The associated BrowserContext.
57 content::BrowserContext* browser_context_; 57 content::BrowserContext* browser_context_;
58 58
59 // The ExtensionActionManager to provide page actions. 59 // The ExtensionActionManager to provide page actions.
60 ExtensionActionManager* action_manager_; 60 ExtensionActionManager* action_manager_;
61 61
62 // Whether or not to show page actions in the location bar at all. (This is
63 // false with the toolbar redesign enabled.)
64 bool should_show_page_actions_;
65
62 // The ActiveScriptController, which could also add actions for extensions if 66 // The ActiveScriptController, which could also add actions for extensions if
63 // they have a pending script. 67 // they have a pending script.
64 scoped_ptr<ActiveScriptController> active_script_controller_; 68 scoped_ptr<ActiveScriptController> active_script_controller_;
65 69
66 ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver> 70 ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
67 extension_registry_observer_; 71 extension_registry_observer_;
68 72
69 DISALLOW_COPY_AND_ASSIGN(LocationBarController); 73 DISALLOW_COPY_AND_ASSIGN(LocationBarController);
70 }; 74 };
71 75
72 } // namespace extensions 76 } // namespace extensions
73 77
74 #endif // CHROME_BROWSER_EXTENSIONS_LOCATION_BAR_CONTROLLER_H_ 78 #endif // CHROME_BROWSER_EXTENSIONS_LOCATION_BAR_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698