diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-28 16:10:37 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-28 16:10:37 +0000 |
| commit | f3728bd46cc5b3d31c380b0349c67e1ed35f9817 (patch) | |
| tree | 5d02ec80e88b975aac677291816e100b09d94134 /chrome/browser/chromeos/frame | |
| parent | e42ae9bd340824c45f0b2ec4d148036cc634372b (diff) | |
| download | chromium_src-f3728bd46cc5b3d31c380b0349c67e1ed35f9817.zip chromium_src-f3728bd46cc5b3d31c380b0349c67e1ed35f9817.tar.gz chromium_src-f3728bd46cc5b3d31c380b0349c67e1ed35f9817.tar.bz2 | |
Added two browser tests for CompactLocationBarHost.
Changed to use ui_controls::SendKeyPress instead of its own.
BUG=http://crosbug.com/2028
TEST=two new browser tests for CompactLocationBarHost.
Review URL: http://codereview.chromium.org/1463002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/frame')
| -rw-r--r-- | chrome/browser/chromeos/frame/browser_view.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/frame/browser_view.h b/chrome/browser/chromeos/frame/browser_view.h index 7f38d95..38fceae 100644 --- a/chrome/browser/chromeos/frame/browser_view.h +++ b/chrome/browser/chromeos/frame/browser_view.h @@ -93,6 +93,12 @@ class BrowserView : public ::BrowserView, } private: + friend class CompactLocationBarHostTest; + + CompactLocationBarHost* compact_location_bar_host() { + return compact_location_bar_host_.get(); + } + void InitSystemMenu(); // AppLauncher button. @@ -106,13 +112,13 @@ class BrowserView : public ::BrowserView, scoped_ptr<views::Menu2> system_menu_menu_; // CompactNavigationBar view. - chromeos::CompactNavigationBar* compact_navigation_bar_; + CompactNavigationBar* compact_navigation_bar_; // The current UI style of the browser. UIStyle ui_style_; // CompactLocationBarHost. - scoped_ptr<chromeos::CompactLocationBarHost> compact_location_bar_host_; + scoped_ptr<CompactLocationBarHost> compact_location_bar_host_; // A flag to specify if the browser window should be maximized. bool force_maximized_window_; |