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

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

Issue 463001: Downward drag after mouse-down is now causing bookmark bar folders to open, r... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 11 years 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/views/bookmark_bar_view.cc ('k') | views/view.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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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_VIEWS_TOOLBAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
6 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ 6 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/ref_counted.h" 10 #include "base/ref_counted.h"
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 virtual void SetAccessibleName(const std::wstring& name); 164 virtual void SetAccessibleName(const std::wstring& name);
165 virtual View* GetAccFocusedChildView() { return acc_focused_view_; } 165 virtual View* GetAccFocusedChildView() { return acc_focused_view_; }
166 166
167 private: 167 private:
168 // Overridden from views::DragController: 168 // Overridden from views::DragController:
169 virtual void WriteDragData(View* sender, 169 virtual void WriteDragData(View* sender,
170 int press_x, 170 int press_x,
171 int press_y, 171 int press_y,
172 OSExchangeData* data); 172 OSExchangeData* data);
173 virtual int GetDragOperations(View* sender, int x, int y); 173 virtual int GetDragOperations(View* sender, int x, int y);
174 virtual bool CanStartDrag(View* sender,
175 int press_x,
176 int press_y,
177 int x,
178 int y) {
179 return true;
180 }
174 181
175 // Returns the number of pixels above the location bar in non-normal display. 182 // Returns the number of pixels above the location bar in non-normal display.
176 int PopupTopSpacing() const; 183 int PopupTopSpacing() const;
177 184
178 // Set up the various Views in the toolbar 185 // Set up the various Views in the toolbar
179 void CreateLeftSideControls(); 186 void CreateLeftSideControls();
180 void CreateCenterStack(Profile* profile); 187 void CreateCenterStack(Profile* profile);
181 void CreateRightSideControls(Profile* profile); 188 void CreateRightSideControls(Profile* profile);
182 void LoadLeftSideControlsImages(); 189 void LoadLeftSideControlsImages();
183 void LoadCenterStackImages(); 190 void LoadCenterStackImages();
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 scoped_ptr<EncodingMenuModel> encoding_menu_contents_; 259 scoped_ptr<EncodingMenuModel> encoding_menu_contents_;
253 scoped_ptr<views::SimpleMenuModel> devtools_menu_contents_; 260 scoped_ptr<views::SimpleMenuModel> devtools_menu_contents_;
254 scoped_ptr<views::SimpleMenuModel> app_menu_contents_; 261 scoped_ptr<views::SimpleMenuModel> app_menu_contents_;
255 262
256 // TODO(beng): build these into MenuButton. 263 // TODO(beng): build these into MenuButton.
257 scoped_ptr<views::Menu2> page_menu_menu_; 264 scoped_ptr<views::Menu2> page_menu_menu_;
258 scoped_ptr<views::Menu2> app_menu_menu_; 265 scoped_ptr<views::Menu2> app_menu_menu_;
259 }; 266 };
260 267
261 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ 268 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/views/bookmark_bar_view.cc ('k') | views/view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698