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

Side by Side Diff: trunk/src/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h

Issue 23814008: Revert 220417 "[temporary M30 fix] Disable dragging tabs with we..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/chrome/browser/ui/views/tabs/browser_tab_strip_controller.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_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/prefs/pref_change_registrar.h" 10 #include "base/prefs/pref_change_registrar.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 virtual void UpdateLoadingAnimations() OVERRIDE; 64 virtual void UpdateLoadingAnimations() OVERRIDE;
65 virtual int HasAvailableDragActions() const OVERRIDE; 65 virtual int HasAvailableDragActions() const OVERRIDE;
66 virtual void OnDropIndexUpdate(int index, bool drop_before) OVERRIDE; 66 virtual void OnDropIndexUpdate(int index, bool drop_before) OVERRIDE;
67 virtual void PerformDrop(bool drop_before, 67 virtual void PerformDrop(bool drop_before,
68 int index, 68 int index,
69 const GURL& url) OVERRIDE; 69 const GURL& url) OVERRIDE;
70 virtual bool IsCompatibleWith(TabStrip* other) const OVERRIDE; 70 virtual bool IsCompatibleWith(TabStrip* other) const OVERRIDE;
71 virtual void CreateNewTab() OVERRIDE; 71 virtual void CreateNewTab() OVERRIDE;
72 virtual bool IsIncognito() OVERRIDE; 72 virtual bool IsIncognito() OVERRIDE;
73 virtual void LayoutTypeMaybeChanged() OVERRIDE; 73 virtual void LayoutTypeMaybeChanged() OVERRIDE;
74 virtual bool IsTabShowingWebViewModalDialog(int index) OVERRIDE;
75 virtual void OnStartedDraggingTabs() OVERRIDE; 74 virtual void OnStartedDraggingTabs() OVERRIDE;
76 virtual void OnStoppedDraggingTabs() OVERRIDE; 75 virtual void OnStoppedDraggingTabs() OVERRIDE;
77 76
78 // TabStripModelObserver implementation: 77 // TabStripModelObserver implementation:
79 virtual void TabInsertedAt(content::WebContents* contents, 78 virtual void TabInsertedAt(content::WebContents* contents,
80 int model_index, 79 int model_index,
81 bool is_active) OVERRIDE; 80 bool is_active) OVERRIDE;
82 virtual void TabDetachedAt(content::WebContents* contents, 81 virtual void TabDetachedAt(content::WebContents* contents,
83 int model_index) OVERRIDE; 82 int model_index) OVERRIDE;
84 virtual void TabSelectionChanged( 83 virtual void TabSelectionChanged(
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 // top-of-window views to be revealed when the user is dragging |tabstrip|'s 155 // top-of-window views to be revealed when the user is dragging |tabstrip|'s
157 // tabs. 156 // tabs.
158 scoped_ptr<ImmersiveRevealedLock> immersive_reveal_lock_; 157 scoped_ptr<ImmersiveRevealedLock> immersive_reveal_lock_;
159 158
160 PrefChangeRegistrar local_pref_registrar_; 159 PrefChangeRegistrar local_pref_registrar_;
161 160
162 DISALLOW_COPY_AND_ASSIGN(BrowserTabStripController); 161 DISALLOW_COPY_AND_ASSIGN(BrowserTabStripController);
163 }; 162 };
164 163
165 #endif // CHROME_BROWSER_UI_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_ 164 #endif // CHROME_BROWSER_UI_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | trunk/src/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698