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

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

Issue 1141005: Revert r42156, r42157, r42160. Allow dynamic switching in and out of sidetabs... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_BROWSER_H_ 5 #ifndef CHROME_BROWSER_BROWSER_H_
6 #define CHROME_BROWSER_BROWSER_H_ 6 #define CHROME_BROWSER_BROWSER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 bool defer_load, 597 bool defer_load,
598 SiteInstance* instance) const; 598 SiteInstance* instance) const;
599 virtual bool CanDuplicateContentsAt(int index); 599 virtual bool CanDuplicateContentsAt(int index);
600 virtual void DuplicateContentsAt(int index); 600 virtual void DuplicateContentsAt(int index);
601 virtual void CloseFrameAfterDragSession(); 601 virtual void CloseFrameAfterDragSession();
602 virtual void CreateHistoricalTab(TabContents* contents); 602 virtual void CreateHistoricalTab(TabContents* contents);
603 virtual bool RunUnloadListenerBeforeClosing(TabContents* contents); 603 virtual bool RunUnloadListenerBeforeClosing(TabContents* contents);
604 virtual bool CanCloseContentsAt(int index); 604 virtual bool CanCloseContentsAt(int index);
605 virtual bool CanBookmarkAllTabs() const; 605 virtual bool CanBookmarkAllTabs() const;
606 virtual void BookmarkAllTabs(); 606 virtual void BookmarkAllTabs();
607 virtual bool UseVerticalTabs() const;
608 virtual void ToggleUseVerticalTabs();
609 607
610 // Overridden from TabStripModelObserver: 608 // Overridden from TabStripModelObserver:
611 virtual void TabInsertedAt(TabContents* contents, 609 virtual void TabInsertedAt(TabContents* contents,
612 int index, 610 int index,
613 bool foreground); 611 bool foreground);
614 virtual void TabClosingAt(TabContents* contents, int index); 612 virtual void TabClosingAt(TabContents* contents, int index);
615 virtual void TabDetachedAt(TabContents* contents, int index); 613 virtual void TabDetachedAt(TabContents* contents, int index);
616 virtual void TabDeselectedAt(TabContents* contents, int index); 614 virtual void TabDeselectedAt(TabContents* contents, int index);
617 virtual void TabSelectedAt(TabContents* old_contents, 615 virtual void TabSelectedAt(TabContents* old_contents,
618 TabContents* new_contents, 616 TabContents* new_contents,
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
939 enum WebAppAction { 937 enum WebAppAction {
940 NONE, // No action at all. 938 NONE, // No action at all.
941 CREATE_SHORTCUT, // Bring up create application shortcut dialog. 939 CREATE_SHORTCUT, // Bring up create application shortcut dialog.
942 UPDATE_SHORTCUT // Update icon for app shortcut. 940 UPDATE_SHORTCUT // Update icon for app shortcut.
943 }; 941 };
944 942
945 // Which deferred action to perform when OnDidGetApplicationInfo is notified 943 // Which deferred action to perform when OnDidGetApplicationInfo is notified
946 // from a TabContents. Currently, only one pending action is allowed. 944 // from a TabContents. Currently, only one pending action is allowed.
947 WebAppAction pending_web_app_action_; 945 WebAppAction pending_web_app_action_;
948 946
949 // Tracks the display mode of the tabstrip.
950 mutable BooleanPrefMember use_vertical_tabs_;
951
952 DISALLOW_COPY_AND_ASSIGN(Browser); 947 DISALLOW_COPY_AND_ASSIGN(Browser);
953 }; 948 };
954 949
955 #endif // CHROME_BROWSER_BROWSER_H_ 950 #endif // CHROME_BROWSER_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698