diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-12 23:58:03 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-12 23:58:03 +0000 |
| commit | a678f3f9eae776faa42469cfc9ca86b0ad68d03e (patch) | |
| tree | 9b44ddb5b19aa8115baddf40b901fcb0e9b900a0 /chrome/app | |
| parent | 7beca7d1d2842cf7e5fe799a3f87b1481fa277fa (diff) | |
| download | chromium_src-a678f3f9eae776faa42469cfc9ca86b0ad68d03e.zip chromium_src-a678f3f9eae776faa42469cfc9ca86b0ad68d03e.tar.gz chromium_src-a678f3f9eae776faa42469cfc9ca86b0ad68d03e.tar.bz2 | |
include CHROMEOS files and defintions in TOOLKIT_VEIWS build.
* changed gyp files so that all files compiled for chrome os will be also compiled when toolkit_views==1
* changed to define OS_CHROMEOS when toolkit_views==1
* changed TabOverbiewMessageListener to use BrowserView instead of BrowserWindowGtk when toolkit_views==1
I left one for CHROME_NOTIFY_FLOATING_TAB_OVER_TOPLEVEL b/c i couldn't figure out how to get gdkwindow
from xid. Looks like I need to register it somewhere
Note: Nicolas updated trybot and buildbot to include chromeos dependency, so this all should compile fine.
BUG=none
TEST=run views unit test and browser.
Review URL: http://codereview.chromium.org/262027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28764 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chromium_strings.grd | 2 | ||||
| -rw-r--r-- | chrome/app/generated_resources.grd | 2 | ||||
| -rw-r--r-- | chrome/app/google_chrome_strings.grd | 2 | ||||
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index da38b89..9bd0485 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -127,7 +127,7 @@ be available for now. --> <message name="IDS_PRODUCT_NAME" desc="The Chrome application name"> Chromium </message> - <if expr="pp_ifdef('chromeos')"> + <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')"> <message name="IDS_PRODUCT_OS_NAME" desc="The Chrome OS application name"> Chromium OS </message> diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 8015426..912e464 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -5646,7 +5646,7 @@ Keep your key file in a safe place. You will need it to create new versions of y </if> <!-- Chrome OS Strings --> - <if expr="pp_ifdef('chromeos')"> + <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')"> <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_NETWORK"> Network </message> diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index dc702c8..f71d7cf 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -177,7 +177,7 @@ Chrome supports. --> <message name="IDS_PRODUCT_NAME" desc="The Chrome application name"> Google Chrome </message> - <if expr="pp_ifdef('chromeos')"> + <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')"> <message name="IDS_PRODUCT_OS_NAME" desc="The Chrome OS application name"> Google Chrome OS </message> diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 4e077e5..a444c21 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -341,7 +341,7 @@ <include name="IDR_PRODUCT_ICON_32" file="chromium/chromium_icon_32.png" type="BINDATA" /> </if> - <if expr="pp_ifdef('chromeos')"> + <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')"> <include name="IDR_NEW_BROWSER_WINDOW_ICON" file="new_browser_window.png" type="BINDATA" /> <include name="IDR_TAB_OVERVIEW_BUTTON_ICON" file="tab_overview.png" type="BINDATA" /> @@ -387,17 +387,17 @@ <include name="IDR_STATUSBAR_WIRED" file="statusbar_wired.png" type="BINDATA" /> </if> - <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> + <if expr="(pp_ifdef('chromeos') or pp_ifdef('toolkit_views')) and pp_ifdef('_google_chrome')"> <include name="IDR_MAIN_MENU_BUTTON" file="google_chrome/button_menu.png" type="BINDATA" /> <include name="IDR_MAIN_MENU_BUTTON_DROP_DOWN" file="google_chrome/button_menu_drop_down.png" type="BINDATA" /> </if> - <if expr="pp_ifdef('chromeos') and not pp_ifdef('_google_chrome')"> + <if expr="(pp_ifdef('chromeos') or pp_ifdef('toolkit_views')) and not pp_ifdef('_google_chrome')"> <include name="IDR_MAIN_MENU_BUTTON" file="chromium/button_menu.png" type="BINDATA" /> <include name="IDR_MAIN_MENU_BUTTON_DROP_DOWN" file="chromium/button_menu_drop_down.png" type="BINDATA" /> </if> - <if expr="not pp_ifdef('chromeos')"> + <if expr="not pp_ifdef('chromeos') and not pp_ifdef('toolkit_views')"> <include name="IDR_THEME_FRAME" file="theme_frame_default.png" type="BINDATA" /> <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" type="BINDATA" /> <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_default_incognito_inactive.png" type="BINDATA" /> |