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

Side by Side Diff: chrome/browser/views/frame/browser_view.h

Issue 333010: Implement keyboard access between bookmarks and toolbar. (Closed)
Patch Set: Add more null checks 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
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-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_FRAME_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 // including the TabStrip, toolbars, download shelves, the content area etc. 63 // including the TabStrip, toolbars, download shelves, the content area etc.
64 // 64 //
65 class BrowserView : public BrowserWindow, 65 class BrowserView : public BrowserWindow,
66 public BrowserWindowTesting, 66 public BrowserWindowTesting,
67 public NotificationObserver, 67 public NotificationObserver,
68 public TabStripModelObserver, 68 public TabStripModelObserver,
69 public views::SimpleMenuModel::Delegate, 69 public views::SimpleMenuModel::Delegate,
70 public views::WindowDelegate, 70 public views::WindowDelegate,
71 public views::ClientView { 71 public views::ClientView {
72 public: 72 public:
73 // The browser view's class name.
74 static const char kViewClassName[];
75
73 // Explicitly sets how windows are shown. Use a value of -1 to give the 76 // Explicitly sets how windows are shown. Use a value of -1 to give the
74 // default behavior. This is used during testing and not generally useful 77 // default behavior. This is used during testing and not generally useful
75 // otherwise. 78 // otherwise.
76 static void SetShowState(int state); 79 static void SetShowState(int state);
77 80
78 explicit BrowserView(Browser* browser); 81 explicit BrowserView(Browser* browser);
79 virtual ~BrowserView(); 82 virtual ~BrowserView();
80 83
81 void set_frame(BrowserFrame* frame) { frame_ = frame; } 84 void set_frame(BrowserFrame* frame) { frame_ = frame; }
82 BrowserFrame* frame() const { return frame_; } 85 BrowserFrame* frame() const { return frame_; }
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 176
174 // Retrieves the icon to use in the frame to indicate an OTR window. 177 // Retrieves the icon to use in the frame to indicate an OTR window.
175 SkBitmap GetOTRAvatarIcon(); 178 SkBitmap GetOTRAvatarIcon();
176 179
177 #if defined(OS_WIN) 180 #if defined(OS_WIN)
178 // Called right before displaying the system menu to allow the BrowserView 181 // Called right before displaying the system menu to allow the BrowserView
179 // to add or delete entries. 182 // to add or delete entries.
180 void PrepareToRunSystemMenu(HMENU menu); 183 void PrepareToRunSystemMenu(HMENU menu);
181 #endif 184 #endif
182 185
186 // Traverses to the next toolbar. |forward| when true, will navigate from left
187 // to right and vice versa when false.
188 void TraverseNextAccessibleToolbar(bool forward);
189
183 // Returns true if the Browser object associated with this BrowserView is a 190 // Returns true if the Browser object associated with this BrowserView is a
184 // normal-type window (i.e. a browser window, not an app or popup). 191 // normal-type window (i.e. a browser window, not an app or popup).
185 bool IsBrowserTypeNormal() const { 192 bool IsBrowserTypeNormal() const {
186 return browser_->type() == Browser::TYPE_NORMAL; 193 return browser_->type() == Browser::TYPE_NORMAL;
187 } 194 }
188 195
189 // Returns true if the frame containing this BrowserView should show the 196 // Returns true if the frame containing this BrowserView should show the
190 // distributor logo. 197 // distributor logo.
191 bool ShouldShowDistributorLogo() const { 198 bool ShouldShowDistributorLogo() const {
192 return browser_->ShouldShowDistributorLogo(); 199 return browser_->ShouldShowDistributorLogo();
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 ExtensionShelf* extension_shelf_; 533 ExtensionShelf* extension_shelf_;
527 534
528 typedef std::set<BrowserBubble*> BubbleSet; 535 typedef std::set<BrowserBubble*> BubbleSet;
529 BubbleSet browser_bubbles_; 536 BubbleSet browser_bubbles_;
530 537
531 // The accessible name of this view. 538 // The accessible name of this view.
532 std::wstring accessible_name_; 539 std::wstring accessible_name_;
533 540
534 scoped_ptr<BrowserExtender> browser_extender_; 541 scoped_ptr<BrowserExtender> browser_extender_;
535 542
543 // Last focused view that issued a tab traversal.
544 int last_focused_view_storage_id_;
545
536 DISALLOW_COPY_AND_ASSIGN(BrowserView); 546 DISALLOW_COPY_AND_ASSIGN(BrowserView);
537 }; 547 };
538 548
539 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ 549 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/views/detachable_toolbar_view.h ('k') | chrome/browser/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698