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

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

Issue 396006: Revert 32012-32017 (Closed)
Patch Set: Created 11 years, 1 month 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 // including the TabStrip, toolbars, download shelves, the content area etc. 64 // including the TabStrip, toolbars, download shelves, the content area etc.
65 // 65 //
66 class BrowserView : public BrowserWindow, 66 class BrowserView : public BrowserWindow,
67 public BrowserWindowTesting, 67 public BrowserWindowTesting,
68 public NotificationObserver, 68 public NotificationObserver,
69 public TabStripModelObserver, 69 public TabStripModelObserver,
70 public views::SimpleMenuModel::Delegate, 70 public views::SimpleMenuModel::Delegate,
71 public views::WindowDelegate, 71 public views::WindowDelegate,
72 public views::ClientView { 72 public views::ClientView {
73 public: 73 public:
74 // The browser view's class name.
75 static const char kViewClassName[];
76
77 // Explicitly sets how windows are shown. Use a value of -1 to give the 74 // Explicitly sets how windows are shown. Use a value of -1 to give the
78 // default behavior. This is used during testing and not generally useful 75 // default behavior. This is used during testing and not generally useful
79 // otherwise. 76 // otherwise.
80 static void SetShowState(int state); 77 static void SetShowState(int state);
81 78
82 explicit BrowserView(Browser* browser); 79 explicit BrowserView(Browser* browser);
83 virtual ~BrowserView(); 80 virtual ~BrowserView();
84 81
85 void set_frame(BrowserFrame* frame) { frame_ = frame; } 82 void set_frame(BrowserFrame* frame) { frame_ = frame; }
86 BrowserFrame* frame() const { return frame_; } 83 BrowserFrame* frame() const { return frame_; }
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 174
178 // Retrieves the icon to use in the frame to indicate an OTR window. 175 // Retrieves the icon to use in the frame to indicate an OTR window.
179 SkBitmap GetOTRAvatarIcon(); 176 SkBitmap GetOTRAvatarIcon();
180 177
181 #if defined(OS_WIN) 178 #if defined(OS_WIN)
182 // Called right before displaying the system menu to allow the BrowserView 179 // Called right before displaying the system menu to allow the BrowserView
183 // to add or delete entries. 180 // to add or delete entries.
184 void PrepareToRunSystemMenu(HMENU menu); 181 void PrepareToRunSystemMenu(HMENU menu);
185 #endif 182 #endif
186 183
187 // Traverses to the next toolbar. |forward| when true, will navigate from left
188 // to right and vice versa when false.
189 void TraverseNextAccessibleToolbar(bool forward);
190
191 // Returns true if the Browser object associated with this BrowserView is a 184 // Returns true if the Browser object associated with this BrowserView is a
192 // normal-type window (i.e. a browser window, not an app or popup). 185 // normal-type window (i.e. a browser window, not an app or popup).
193 bool IsBrowserTypeNormal() const { 186 bool IsBrowserTypeNormal() const {
194 return browser_->type() == Browser::TYPE_NORMAL; 187 return browser_->type() == Browser::TYPE_NORMAL;
195 } 188 }
196 189
197 // Returns true if the frame containing this BrowserView should show the 190 // Returns true if the frame containing this BrowserView should show the
198 // distributor logo. 191 // distributor logo.
199 bool ShouldShowDistributorLogo() const { 192 bool ShouldShowDistributorLogo() const {
200 return browser_->ShouldShowDistributorLogo(); 193 return browser_->ShouldShowDistributorLogo();
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 530
538 // The accessible name of this view. 531 // The accessible name of this view.
539 std::wstring accessible_name_; 532 std::wstring accessible_name_;
540 533
541 scoped_ptr<BrowserExtender> browser_extender_; 534 scoped_ptr<BrowserExtender> browser_extender_;
542 535
543 DISALLOW_COPY_AND_ASSIGN(BrowserView); 536 DISALLOW_COPY_AND_ASSIGN(BrowserView);
544 }; 537 };
545 538
546 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ 539 #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