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

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

Issue 115309: Remove even more ATL dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 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/browser/views/tabs/tab_renderer.cc ('k') | chrome/browser/views/toolbar_view.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 virtual void SetAccessibleName(const std::wstring& name); 65 virtual void SetAccessibleName(const std::wstring& name);
66 virtual void ThemeChanged(); 66 virtual void ThemeChanged();
67 67
68 // Overridden from EncodingMenuControllerDelegate: 68 // Overridden from EncodingMenuControllerDelegate:
69 virtual bool IsItemChecked(int id) const; 69 virtual bool IsItemChecked(int id) const;
70 70
71 // Overridden from Menu::BaseControllerDelegate: 71 // Overridden from Menu::BaseControllerDelegate:
72 virtual bool GetAcceleratorInfo(int id, views::Accelerator* accel); 72 virtual bool GetAcceleratorInfo(int id, views::Accelerator* accel);
73 73
74 // views::MenuDelegate 74 // views::MenuDelegate
75 virtual void RunMenu(views::View* source, const CPoint& pt, HWND hwnd); 75 virtual void RunMenu(views::View* source, const gfx::Point& pt, HWND hwnd);
76 76
77 // GetProfilesHelper::Delegate method. 77 // GetProfilesHelper::Delegate method.
78 virtual void OnGetProfilesDone(const std::vector<std::wstring>& profiles); 78 virtual void OnGetProfilesDone(const std::vector<std::wstring>& profiles);
79 79
80 // Sets the profile which is active on the currently-active tab. 80 // Sets the profile which is active on the currently-active tab.
81 void SetProfile(Profile* profile); 81 void SetProfile(Profile* profile);
82 Profile* profile() { return profile_; } 82 Profile* profile() { return profile_; }
83 83
84 ToolbarStarToggle* star_button() { return star_; } 84 ToolbarStarToggle* star_button() { return star_; }
85 85
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 void CreateRightSideControls(Profile* profile); 150 void CreateRightSideControls(Profile* profile);
151 void LoadLeftSideControlsImages(); 151 void LoadLeftSideControlsImages();
152 void LoadCenterStackImages(); 152 void LoadCenterStackImages();
153 void LoadRightSideControlsImages(); 153 void LoadRightSideControlsImages();
154 154
155 // Updates the controls to display the security appropriately (highlighted if 155 // Updates the controls to display the security appropriately (highlighted if
156 // secure). 156 // secure).
157 void SetSecurityLevel(ToolbarModel::SecurityLevel security_level); 157 void SetSecurityLevel(ToolbarModel::SecurityLevel security_level);
158 158
159 // Show the page menu. 159 // Show the page menu.
160 void RunPageMenu(const CPoint& pt, HWND hwnd); 160 void RunPageMenu(const gfx::Point& pt, HWND hwnd);
161 161
162 // Show the app menu. 162 // Show the app menu.
163 void RunAppMenu(const CPoint& pt, HWND hwnd); 163 void RunAppMenu(const gfx::Point& pt, HWND hwnd);
164 164
165 // Overridden from View, to pass keyboard triggering of the right-click 165 // Overridden from View, to pass keyboard triggering of the right-click
166 // context menu on to the toolbar child view that currently has the 166 // context menu on to the toolbar child view that currently has the
167 // accessibility focus. 167 // accessibility focus.
168 virtual void ShowContextMenu(int x, int y, bool is_mouse_gesture); 168 virtual void ShowContextMenu(int x, int y, bool is_mouse_gesture);
169 169
170 bool IsDisplayModeNormal() const { 170 bool IsDisplayModeNormal() const {
171 return display_mode_ == DISPLAYMODE_NORMAL; 171 return display_mode_ == DISPLAYMODE_NORMAL;
172 } 172 }
173 173
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 scoped_refptr<GetProfilesHelper> profiles_helper_; 208 scoped_refptr<GetProfilesHelper> profiles_helper_;
209 209
210 // Controls whether or not a home button should be shown on the toolbar. 210 // Controls whether or not a home button should be shown on the toolbar.
211 BooleanPrefMember show_home_button_; 211 BooleanPrefMember show_home_button_;
212 212
213 // The display mode used when laying out the toolbar. 213 // The display mode used when laying out the toolbar.
214 DisplayMode display_mode_; 214 DisplayMode display_mode_;
215 }; 215 };
216 216
217 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_ 217 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/views/tabs/tab_renderer.cc ('k') | chrome/browser/views/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698