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

Side by Side Diff: chrome/browser/ui/toolbar/toolbar_actions_model.h

Issue 2450633004: Make ToolbarActionsModel ignore calls to AddComponentAction() before initialization (Closed)
Patch Set: Add a TODO Created 4 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
« no previous file with comments | « no previous file | chrome/browser/ui/toolbar/toolbar_actions_model.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_TOOLBAR_TOOLBAR_ACTIONS_MODEL_H_ 5 #ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_MODEL_H_
6 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_MODEL_H_ 6 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_MODEL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 HighlightType highlight_type() const { return highlight_type_; } 174 HighlightType highlight_type() const { return highlight_type_; }
175 175
176 bool has_active_bubble() const { return has_active_bubble_; } 176 bool has_active_bubble() const { return has_active_bubble_; }
177 void set_has_active_bubble(bool has_active_bubble) { 177 void set_has_active_bubble(bool has_active_bubble) {
178 has_active_bubble_ = has_active_bubble; 178 has_active_bubble_ = has_active_bubble;
179 } 179 }
180 180
181 void SetActionVisibility(const std::string& action_id, bool visible); 181 void SetActionVisibility(const std::string& action_id, bool visible);
182 182
183 // ComponentMigrationHelper::ComponentActionDelegate: 183 // ComponentMigrationHelper::ComponentActionDelegate:
184 // AddComponentAction() is a no-op if |actions_initialized_| is false.
184 void AddComponentAction(const std::string& action_id) override; 185 void AddComponentAction(const std::string& action_id) override;
185 void RemoveComponentAction(const std::string& action_id) override; 186 void RemoveComponentAction(const std::string& action_id) override;
186 bool HasComponentAction(const std::string& action_id) const override; 187 bool HasComponentAction(const std::string& action_id) const override;
187 188
188 void OnActionToolbarPrefChange(); 189 void OnActionToolbarPrefChange();
189 190
190 // Highlights the actions specified by |action_ids|. This will cause 191 // Highlights the actions specified by |action_ids|. This will cause
191 // the ToolbarModel to only display those actions. 192 // the ToolbarModel to only display those actions.
192 // Highlighting mode is only entered if there is at least one action to be 193 // Highlighting mode is only entered if there is at least one action to be
193 // shown. 194 // shown.
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 // For observing change of toolbar order preference by external entity (sync). 338 // For observing change of toolbar order preference by external entity (sync).
338 PrefChangeRegistrar pref_change_registrar_; 339 PrefChangeRegistrar pref_change_registrar_;
339 base::Closure pref_change_callback_; 340 base::Closure pref_change_callback_;
340 341
341 base::WeakPtrFactory<ToolbarActionsModel> weak_ptr_factory_; 342 base::WeakPtrFactory<ToolbarActionsModel> weak_ptr_factory_;
342 343
343 DISALLOW_COPY_AND_ASSIGN(ToolbarActionsModel); 344 DISALLOW_COPY_AND_ASSIGN(ToolbarActionsModel);
344 }; 345 };
345 346
346 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_MODEL_H_ 347 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_MODEL_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/toolbar/toolbar_actions_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698