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

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

Issue 10630013: Adds LocationBarContainer that contains (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed debugging code Created 8 years, 6 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 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 541
542 // Exposes resize corner size to BrowserViewLayout. 542 // Exposes resize corner size to BrowserViewLayout.
543 gfx::Size GetResizeCornerSize() const; 543 gfx::Size GetResizeCornerSize() const;
544 544
545 // Set the value of |toolbar_| and hook it into the views hierarchy 545 // Set the value of |toolbar_| and hook it into the views hierarchy
546 void SetToolbar(ToolbarView* toolbar); 546 void SetToolbar(ToolbarView* toolbar);
547 547
548 // Create an icon for this window in the launcher (currently only for Ash). 548 // Create an icon for this window in the launcher (currently only for Ash).
549 void CreateLauncherIcon(); 549 void CreateLauncherIcon();
550 550
551 // Forces the LocationBarContainer to the top of the native window stacking
552 // order. This is needed for the Instant extended API when the location bar
553 // can be placed over web contents.
554 void RestackLocationBarContainer();
555
551 // Last focused view that issued a tab traversal. 556 // Last focused view that issued a tab traversal.
552 int last_focused_view_storage_id_; 557 int last_focused_view_storage_id_;
553 558
554 // The BrowserFrame that hosts this view. 559 // The BrowserFrame that hosts this view.
555 BrowserFrame* frame_; 560 BrowserFrame* frame_;
556 561
557 // The Browser object we are associated with. 562 // The Browser object we are associated with.
558 scoped_ptr<Browser> browser_; 563 scoped_ptr<Browser> browser_;
559 564
560 // BrowserView layout (LTR one is pictured here). 565 // BrowserView layout (LTR one is pictured here).
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 bool force_location_bar_focus_; 699 bool force_location_bar_focus_;
695 700
696 PendingFullscreenRequest fullscreen_request_; 701 PendingFullscreenRequest fullscreen_request_;
697 702
698 gfx::ScopedSysColorChangeListener color_change_listener_; 703 gfx::ScopedSysColorChangeListener color_change_listener_;
699 704
700 DISALLOW_COPY_AND_ASSIGN(BrowserView); 705 DISALLOW_COPY_AND_ASSIGN(BrowserView);
701 }; 706 };
702 707
703 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 708 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698