summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_browser.gypi
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-22 22:21:57 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-22 22:21:57 +0000
commitc2de68aeea9a829af41f087f2c3b3c347f7f196e (patch)
tree55438e660771845ef9d50e28ea39486d8ee72e8a /chrome/chrome_browser.gypi
parent0d2292796fc314c5163dcd26234107df3cb819c4 (diff)
downloadchromium_src-c2de68aeea9a829af41f087f2c3b3c347f7f196e.zip
chromium_src-c2de68aeea9a829af41f087f2c3b3c347f7f196e.tar.gz
chromium_src-c2de68aeea9a829af41f087f2c3b3c347f7f196e.tar.bz2
BrowserFrameView for ChromeOS.
* Introduced NormalBrowserFrameView, which can place OTR avatar icon in the right place. - This is based on OpaqueBrowserFrameView, but a lot of stuff that are unnecessary in ChromeOS has been removed. - Moved OTR Avatar icon view to BrowserView for now as this is much simpler to implement the above change. I'll revisit the possibility to refactor layout code to GetBoundsForXXX later. * removed most of browser extender stuff. BUG=chromium-os:1007 TEST=open incognito window and switch to compact navigation mode (ctrl-shift-c). incognito icon should be placed between tabstrip and status area. Review URL: http://codereview.chromium.org/593098 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39645 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
-rwxr-xr-xchrome/chrome_browser.gypi8
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 3d97e3b..6a45dcb 100755
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -305,11 +305,12 @@
'browser/chromeos/external_metrics.h',
'browser/chromeos/external_protocol_dialog.cc',
'browser/chromeos/external_protocol_dialog.h',
- 'browser/chromeos/frame/browser_extenders.cc',
'browser/chromeos/frame/browser_frame_chromeos.cc',
'browser/chromeos/frame/browser_frame_chromeos.h',
'browser/chromeos/frame/browser_view.cc',
'browser/chromeos/frame/browser_view.h',
+ 'browser/chromeos/frame/normal_browser_frame_view.cc',
+ 'browser/chromeos/frame/normal_browser_frame_view.h',
'browser/chromeos/frame/panel_browser_view.cc',
'browser/chromeos/frame/panel_browser_view.h',
'browser/chromeos/frame/panel_controller.cc',
@@ -1969,7 +1970,6 @@
'browser/views/frame/app_panel_browser_frame_view.h',
'browser/views/frame/browser_bubble_host.cc',
'browser/views/frame/browser_bubble_host.h',
- 'browser/views/frame/browser_extender.cc',
'browser/views/frame/browser_extender.h',
'browser/views/frame/browser_frame.h',
'browser/views/frame/browser_frame_gtk.cc',
@@ -1987,7 +1987,6 @@
'browser/views/frame/glass_browser_frame_view.h',
'browser/views/frame/opaque_browser_frame_view.cc',
'browser/views/frame/opaque_browser_frame_view.h',
- 'browser/views/frame/standard_extender.cc',
'browser/views/fullscreen_exit_bubble.cc',
'browser/views/fullscreen_exit_bubble.h',
'browser/views/go_button.cc',
@@ -2531,7 +2530,6 @@
['include', '^browser/views/frame/browser_bubble_host.h'],
['include', '^browser/views/frame/browser_view_layout.cc'],
['include', '^browser/views/frame/browser_view_layout.h'],
- ['include', '^browser/views/frame/browser_extender.cc'],
['include', '^browser/views/frame/browser_extender.h'],
['include', '^browser/views/frame/browser_view.cc'],
['include', '^browser/views/frame/browser_view.h'],
@@ -2687,8 +2685,6 @@
}],
['OS=="linux" and toolkit_views==1', {
'sources/': [
- ['include', '^browser/views/frame/standard_extender.h'],
- ['include', '^browser/views/frame/standard_extender.cc'],
['include', '^browser/gtk/external_protocol_dialog_gtk.cc'],
['include', '^browser/gtk/external_protocol_dialog_gtk.h'],
['include', '^browser/views/notifications/balloon_view.cc'],