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

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

Issue 11364196: Remove TabContents from TabStripModelObserver::ActiveTabChanged. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 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 | « chrome/browser/ui/bookmarks/bookmark_prompt_controller.cc ('k') | chrome/browser/ui/browser.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_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 // Overridden from TabStripModelObserver: 429 // Overridden from TabStripModelObserver:
430 virtual void TabInsertedAt(content::WebContents* contents, 430 virtual void TabInsertedAt(content::WebContents* contents,
431 int index, 431 int index,
432 bool foreground) OVERRIDE; 432 bool foreground) OVERRIDE;
433 virtual void TabClosingAt(TabStripModel* tab_strip_model, 433 virtual void TabClosingAt(TabStripModel* tab_strip_model,
434 content::WebContents* contents, 434 content::WebContents* contents,
435 int index) OVERRIDE; 435 int index) OVERRIDE;
436 virtual void TabDetachedAt(content::WebContents* contents, 436 virtual void TabDetachedAt(content::WebContents* contents,
437 int index) OVERRIDE; 437 int index) OVERRIDE;
438 virtual void TabDeactivated(content::WebContents* contents) OVERRIDE; 438 virtual void TabDeactivated(content::WebContents* contents) OVERRIDE;
439 virtual void ActiveTabChanged(TabContents* old_contents, 439 virtual void ActiveTabChanged(content::WebContents* old_contents,
440 TabContents* new_contents, 440 content::WebContents* new_contents,
441 int index, 441 int index,
442 bool user_gesture) OVERRIDE; 442 bool user_gesture) OVERRIDE;
443 virtual void TabMoved(TabContents* contents, 443 virtual void TabMoved(TabContents* contents,
444 int from_index, 444 int from_index,
445 int to_index) OVERRIDE; 445 int to_index) OVERRIDE;
446 virtual void TabReplacedAt(TabStripModel* tab_strip_model, 446 virtual void TabReplacedAt(TabStripModel* tab_strip_model,
447 TabContents* old_contents, 447 TabContents* old_contents,
448 TabContents* new_contents, 448 TabContents* new_contents,
449 int index) OVERRIDE; 449 int index) OVERRIDE;
450 virtual void TabPinnedStateChanged(content::WebContents* contents, 450 virtual void TabPinnedStateChanged(content::WebContents* contents,
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
711 // UI update coalescing and handling //////////////////////////////////////// 711 // UI update coalescing and handling ////////////////////////////////////////
712 712
713 // Asks the toolbar (and as such the location bar) to update its state to 713 // Asks the toolbar (and as such the location bar) to update its state to
714 // reflect the current tab's current URL, security state, etc. 714 // reflect the current tab's current URL, security state, etc.
715 // If |should_restore_state| is true, we're switching (back?) to this tab and 715 // If |should_restore_state| is true, we're switching (back?) to this tab and
716 // should restore any previous location bar state (such as user editing) as 716 // should restore any previous location bar state (such as user editing) as
717 // well. 717 // well.
718 void UpdateToolbar(bool should_restore_state); 718 void UpdateToolbar(bool should_restore_state);
719 719
720 // Updates the browser's search model with the tab's search model. 720 // Updates the browser's search model with the tab's search model.
721 void UpdateSearchState(TabContents* contents); 721 void UpdateSearchState(content::WebContents* contents);
722 722
723 // Does one or both of the following for each bit in |changed_flags|: 723 // Does one or both of the following for each bit in |changed_flags|:
724 // . If the update should be processed immediately, it is. 724 // . If the update should be processed immediately, it is.
725 // . If the update should processed asynchronously (to avoid lots of ui 725 // . If the update should processed asynchronously (to avoid lots of ui
726 // updates), then scheduled_updates_ is updated for the |source| and update 726 // updates), then scheduled_updates_ is updated for the |source| and update
727 // pair and a task is scheduled (assuming it isn't running already) 727 // pair and a task is scheduled (assuming it isn't running already)
728 // that invokes ProcessPendingUIUpdates. 728 // that invokes ProcessPendingUIUpdates.
729 void ScheduleUIUpdate(const content::WebContents* source, 729 void ScheduleUIUpdate(const content::WebContents* source,
730 unsigned changed_flags); 730 unsigned changed_flags);
731 731
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
951 bool window_has_shown_; 951 bool window_has_shown_;
952 952
953 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 953 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
954 // before DidEndColorChooser is called. 954 // before DidEndColorChooser is called.
955 scoped_ptr<content::ColorChooser> color_chooser_; 955 scoped_ptr<content::ColorChooser> color_chooser_;
956 956
957 DISALLOW_COPY_AND_ASSIGN(Browser); 957 DISALLOW_COPY_AND_ASSIGN(Browser);
958 }; 958 };
959 959
960 #endif // CHROME_BROWSER_UI_BROWSER_H_ 960 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_prompt_controller.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698