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

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

Issue 467017: Downward drag after mouse-down is now causing bookmark bar folders to open, r... (Closed) Base URL: svn://svn.chromium.org/chrome/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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 virtual void Paint(gfx::Canvas* canvas); 144 virtual void Paint(gfx::Canvas* canvas);
145 virtual void ThemeChanged(); 145 virtual void ThemeChanged();
146 146
147 private: 147 private:
148 // Overridden from views::DragController: 148 // Overridden from views::DragController:
149 virtual void WriteDragData(View* sender, 149 virtual void WriteDragData(View* sender,
150 int press_x, 150 int press_x,
151 int press_y, 151 int press_y,
152 OSExchangeData* data); 152 OSExchangeData* data);
153 virtual int GetDragOperations(View* sender, int x, int y); 153 virtual int GetDragOperations(View* sender, int x, int y);
154 virtual bool CanStartDrag(View* sender,
155 int press_x,
156 int press_y,
157 int x,
158 int y) {
159 return true;
160 }
154 161
155 // Returns the number of pixels above the location bar in non-normal display. 162 // Returns the number of pixels above the location bar in non-normal display.
156 int PopupTopSpacing() const; 163 int PopupTopSpacing() const;
157 164
158 // Set up the various Views in the toolbar 165 // Set up the various Views in the toolbar
159 void CreateLeftSideControls(); 166 void CreateLeftSideControls();
160 void CreateCenterStack(Profile* profile); 167 void CreateCenterStack(Profile* profile);
161 void CreateRightSideControls(Profile* profile); 168 void CreateRightSideControls(Profile* profile);
162 void LoadLeftSideControlsImages(); 169 void LoadLeftSideControlsImages();
163 void LoadCenterStackImages(); 170 void LoadCenterStackImages();
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 scoped_ptr<EncodingMenuModel> encoding_menu_contents_; 232 scoped_ptr<EncodingMenuModel> encoding_menu_contents_;
226 scoped_ptr<views::SimpleMenuModel> devtools_menu_contents_; 233 scoped_ptr<views::SimpleMenuModel> devtools_menu_contents_;
227 scoped_ptr<views::SimpleMenuModel> app_menu_contents_; 234 scoped_ptr<views::SimpleMenuModel> app_menu_contents_;
228 235
229 // TODO(beng): build these into MenuButton. 236 // TODO(beng): build these into MenuButton.
230 scoped_ptr<views::Menu2> page_menu_menu_; 237 scoped_ptr<views::Menu2> page_menu_menu_;
231 scoped_ptr<views::Menu2> app_menu_menu_; 238 scoped_ptr<views::Menu2> app_menu_menu_;
232 }; 239 };
233 240
234 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ 241 #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