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

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: Remove set_view_to_focus 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
« no previous file with comments | « no previous file | 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) 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 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 536
537 // Exposes resize corner size to BrowserViewLayout. 537 // Exposes resize corner size to BrowserViewLayout.
538 gfx::Size GetResizeCornerSize() const; 538 gfx::Size GetResizeCornerSize() const;
539 539
540 // Set the value of |toolbar_| and hook it into the views hierarchy 540 // Set the value of |toolbar_| and hook it into the views hierarchy
541 void SetToolbar(ToolbarView* toolbar); 541 void SetToolbar(ToolbarView* toolbar);
542 542
543 // Create an icon for this window in the launcher (currently only for Ash). 543 // Create an icon for this window in the launcher (currently only for Ash).
544 void CreateLauncherIcon(); 544 void CreateLauncherIcon();
545 545
546 // Forces the LocationBarContainer to the top of the native window stacking
547 // order. This is needed for the Instant extended API when the location bar
548 // can be placed over web contents.
549 void RestackLocationBarContainer();
550
546 // Last focused view that issued a tab traversal. 551 // Last focused view that issued a tab traversal.
547 int last_focused_view_storage_id_; 552 int last_focused_view_storage_id_;
548 553
549 // The BrowserFrame that hosts this view. 554 // The BrowserFrame that hosts this view.
550 BrowserFrame* frame_; 555 BrowserFrame* frame_;
551 556
552 // The Browser object we are associated with. 557 // The Browser object we are associated with.
553 scoped_ptr<Browser> browser_; 558 scoped_ptr<Browser> browser_;
554 559
555 // BrowserView layout (LTR one is pictured here). 560 // BrowserView layout (LTR one is pictured here).
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 bool force_location_bar_focus_; 694 bool force_location_bar_focus_;
690 695
691 PendingFullscreenRequest fullscreen_request_; 696 PendingFullscreenRequest fullscreen_request_;
692 697
693 gfx::ScopedSysColorChangeListener color_change_listener_; 698 gfx::ScopedSysColorChangeListener color_change_listener_;
694 699
695 DISALLOW_COPY_AND_ASSIGN(BrowserView); 700 DISALLOW_COPY_AND_ASSIGN(BrowserView);
696 }; 701 };
697 702
698 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 703 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698