summaryrefslogtreecommitdiffstats
path: root/tools/channel_changer
diff options
context:
space:
mode:
authorfinnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-29 18:37:13 +0000
committerfinnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-29 18:37:13 +0000
commit809ad6ea402a6a15af7da6d527360da10b9e66a8 (patch)
tree0b4971fcd36f465ecad2f5526ea3a46dfb40fa05 /tools/channel_changer
parent8e334005b7df41cd08a86bb7dc80a3f166957707 (diff)
downloadchromium_src-809ad6ea402a6a15af7da6d527360da10b9e66a8.zip
chromium_src-809ad6ea402a6a15af7da6d527360da10b9e66a8.tar.gz
chromium_src-809ad6ea402a6a15af7da6d527360da10b9e66a8.tar.bz2
A few changes to the channel changer:
Replaced the incognito glasses with the new Chrome logo. Also changed the application icon to the Chrome app icon. Changed the project settings to statically link with the CRT to avoid side-by-side errors on Vista. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1537 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/channel_changer')
-rw-r--r--tools/channel_changer/channel_changer.icobin34494 -> 0 bytes
-rw-r--r--tools/channel_changer/channel_changer.rc4
-rw-r--r--tools/channel_changer/channel_changer.vcproj4
-rw-r--r--tools/channel_changer/chrome.bmpbin0 -> 9270 bytes
-rw-r--r--tools/channel_changer/glasses.bmpbin7958 -> 0 bytes
5 files changed, 4 insertions, 4 deletions
diff --git a/tools/channel_changer/channel_changer.ico b/tools/channel_changer/channel_changer.ico
deleted file mode 100644
index 401329f..0000000
--- a/tools/channel_changer/channel_changer.ico
+++ /dev/null
Binary files differ
diff --git a/tools/channel_changer/channel_changer.rc b/tools/channel_changer/channel_changer.rc
index ba89a09..34f5653 100644
--- a/tools/channel_changer/channel_changer.rc
+++ b/tools/channel_changer/channel_changer.rc
@@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_BRANCH_SWITCHER ICON "channel_changer.ico"
+IDI_BRANCH_SWITCHER ICON "../../chrome/app/theme/google_chrome/chrome.ico"
/////////////////////////////////////////////////////////////////////////////
//
@@ -106,7 +106,7 @@ END
// Bitmap
//
-IDB_PICTURE BITMAP "glasses.bmp"
+IDB_PICTURE BITMAP "chrome.bmp"
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/tools/channel_changer/channel_changer.vcproj b/tools/channel_changer/channel_changer.vcproj
index 743dc5b..94aab3c 100644
--- a/tools/channel_changer/channel_changer.vcproj
+++ b/tools/channel_changer/channel_changer.vcproj
@@ -45,7 +45,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
@@ -120,7 +120,7 @@
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../.."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
- RuntimeLibrary="2"
+ RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
diff --git a/tools/channel_changer/chrome.bmp b/tools/channel_changer/chrome.bmp
new file mode 100644
index 0000000..96f4482
--- /dev/null
+++ b/tools/channel_changer/chrome.bmp
Binary files differ
diff --git a/tools/channel_changer/glasses.bmp b/tools/channel_changer/glasses.bmp
deleted file mode 100644
index ee80550..0000000
--- a/tools/channel_changer/glasses.bmp
+++ /dev/null
Binary files differ