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

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

Issue 8110003: Show avatar menu from NTP4 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac build Created 9 years, 2 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/ui/panels/panel.cc ('k') | chrome/browser/ui/views/frame/browser_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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 virtual void PrepareForInstant() OVERRIDE; 320 virtual void PrepareForInstant() OVERRIDE;
321 virtual void ShowInstant(TabContentsWrapper* preview) OVERRIDE; 321 virtual void ShowInstant(TabContentsWrapper* preview) OVERRIDE;
322 virtual void HideInstant(bool instant_is_active) OVERRIDE; 322 virtual void HideInstant(bool instant_is_active) OVERRIDE;
323 virtual gfx::Rect GetInstantBounds() OVERRIDE; 323 virtual gfx::Rect GetInstantBounds() OVERRIDE;
324 virtual WindowOpenDisposition GetDispositionForPopupBounds( 324 virtual WindowOpenDisposition GetDispositionForPopupBounds(
325 const gfx::Rect& bounds) OVERRIDE; 325 const gfx::Rect& bounds) OVERRIDE;
326 virtual FindBar* CreateFindBar() OVERRIDE; 326 virtual FindBar* CreateFindBar() OVERRIDE;
327 #if defined(OS_CHROMEOS) 327 #if defined(OS_CHROMEOS)
328 virtual void ShowKeyboardOverlay(gfx::NativeWindow owning_window) OVERRIDE; 328 virtual void ShowKeyboardOverlay(gfx::NativeWindow owning_window) OVERRIDE;
329 #endif 329 #endif
330 virtual void ShowAvatarBubble(TabContents* tab_contents,
331 const gfx::Rect& rect) OVERRIDE;
330 332
331 // Overridden from BrowserWindowTesting: 333 // Overridden from BrowserWindowTesting:
332 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; 334 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE;
333 virtual LocationBarView* GetLocationBarView() const OVERRIDE; 335 virtual LocationBarView* GetLocationBarView() const OVERRIDE;
334 virtual views::View* GetTabContentsContainerView() const OVERRIDE; 336 virtual views::View* GetTabContentsContainerView() const OVERRIDE;
335 virtual views::View* GetSidebarContainerView() const OVERRIDE; 337 virtual views::View* GetSidebarContainerView() const OVERRIDE;
336 virtual ToolbarView* GetToolbarView() const OVERRIDE; 338 virtual ToolbarView* GetToolbarView() const OVERRIDE;
337 339
338 // Overridden from NotificationObserver: 340 // Overridden from NotificationObserver:
339 virtual void Observe(int type, 341 virtual void Observe(int type,
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 base::TimeTicks last_animation_time_; 700 base::TimeTicks last_animation_time_;
699 701
700 // If this flag is set then SetFocusToLocationBar() will set focus to the 702 // If this flag is set then SetFocusToLocationBar() will set focus to the
701 // location bar even if the browser window is not active. 703 // location bar even if the browser window is not active.
702 bool force_location_bar_focus_; 704 bool force_location_bar_focus_;
703 705
704 DISALLOW_COPY_AND_ASSIGN(BrowserView); 706 DISALLOW_COPY_AND_ASSIGN(BrowserView);
705 }; 707 };
706 708
707 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 709 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/panels/panel.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698