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

Side by Side Diff: chrome/browser/ui/views/browser_actions_container.h

Issue 8473006: Revert 110824 - Variety of crashes on XP dbg bots (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/views/extensions/extension_installed_bubble.h » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_VIEWS_BROWSER_ACTIONS_CONTAINER_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
6 #define CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_ 6 #define CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 272
273 void Init(); 273 void Init();
274 274
275 // Get the number of browser actions being displayed. 275 // Get the number of browser actions being displayed.
276 int num_browser_actions() const { return browser_action_views_.size(); } 276 int num_browser_actions() const { return browser_action_views_.size(); }
277 277
278 // Whether we are performing resize animation on the container. 278 // Whether we are performing resize animation on the container.
279 bool animating() const { return animation_target_size_ > 0; } 279 bool animating() const { return animation_target_size_ > 0; }
280 280
281 // Returns the chevron, if any. 281 // Returns the chevron, if any.
282 views::View* chevron() { return chevron_; }
283 const views::View* chevron() const { return chevron_; } 282 const views::View* chevron() const { return chevron_; }
284 283
285 // Returns the profile this container is associated with. 284 // Returns the profile this container is associated with.
286 Profile* profile() const { return profile_; } 285 Profile* profile() const { return profile_; }
287 286
288 // Returns the browser this container is associated with. 287 // Returns the browser this container is associated with.
289 Browser* browser() const { return browser_; } 288 Browser* browser() const { return browser_; }
290 289
291 // Returns the current tab's ID, or -1 if there is no current tab. 290 // Returns the current tab's ID, or -1 if there is no current tab.
292 int GetCurrentTabId() const; 291 int GetCurrentTabId() const;
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 512
514 base::WeakPtrFactory<BrowserActionsContainer> task_factory_; 513 base::WeakPtrFactory<BrowserActionsContainer> task_factory_;
515 514
516 // Handles delayed showing of the overflow menu when hovering. 515 // Handles delayed showing of the overflow menu when hovering.
517 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_; 516 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_;
518 517
519 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); 518 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
520 }; 519 };
521 520
522 #endif // CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_ 521 #endif // CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/extensions/extension_installed_bubble.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698