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

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

Issue 10933085: Update ConstrainedWindowViews appearance according to mock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Browser test fixes Created 8 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 virtual void Paste() OVERRIDE; 338 virtual void Paste() OVERRIDE;
339 virtual void ShowInstant(TabContents* preview, 339 virtual void ShowInstant(TabContents* preview,
340 int height, 340 int height,
341 InstantSizeUnits units) OVERRIDE; 341 InstantSizeUnits units) OVERRIDE;
342 virtual void HideInstant() OVERRIDE; 342 virtual void HideInstant() OVERRIDE;
343 virtual gfx::Rect GetInstantBounds() OVERRIDE; 343 virtual gfx::Rect GetInstantBounds() OVERRIDE;
344 virtual bool IsInstantTabShowing() OVERRIDE; 344 virtual bool IsInstantTabShowing() OVERRIDE;
345 virtual WindowOpenDisposition GetDispositionForPopupBounds( 345 virtual WindowOpenDisposition GetDispositionForPopupBounds(
346 const gfx::Rect& bounds) OVERRIDE; 346 const gfx::Rect& bounds) OVERRIDE;
347 virtual FindBar* CreateFindBar() OVERRIDE; 347 virtual FindBar* CreateFindBar() OVERRIDE;
348 virtual int GetConstrainedWindowTopY() OVERRIDE;
348 virtual void ShowAvatarBubble(content::WebContents* web_contents, 349 virtual void ShowAvatarBubble(content::WebContents* web_contents,
349 const gfx::Rect& rect) OVERRIDE; 350 const gfx::Rect& rect) OVERRIDE;
350 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE; 351 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE;
351 virtual void ShowPasswordGenerationBubble( 352 virtual void ShowPasswordGenerationBubble(
352 const gfx::Rect& rect, 353 const gfx::Rect& rect,
353 const webkit::forms::PasswordForm& form, 354 const webkit::forms::PasswordForm& form,
354 autofill::PasswordGenerator* password_generator) OVERRIDE; 355 autofill::PasswordGenerator* password_generator) OVERRIDE;
355 356
356 // Overridden from BrowserWindowTesting: 357 // Overridden from BrowserWindowTesting:
357 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; 358 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE;
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
725 #if defined(USE_AURA) 726 #if defined(USE_AURA)
726 scoped_ptr<SearchViewController> search_view_controller_; 727 scoped_ptr<SearchViewController> search_view_controller_;
727 #endif 728 #endif
728 729
729 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 730 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
730 731
731 DISALLOW_COPY_AND_ASSIGN(BrowserView); 732 DISALLOW_COPY_AND_ASSIGN(BrowserView);
732 }; 733 };
733 734
734 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 735 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698