diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 00:21:22 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 00:21:22 +0000 |
| commit | a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5 (patch) | |
| tree | 2cb114cfcd3d89203d045c56ec2af4d2d52cf9b0 /remoting | |
| parent | b09be0a7dace2e86516a2661c9c504d640abed7c (diff) | |
| download | chromium_src-a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5.zip chromium_src-a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5.tar.gz chromium_src-a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5.tar.bz2 | |
Remove TOOLKIT_USES_GTK and consolidate it into TOOLKIT_GTK
Add gtk dependency to base.gyp for android host_os="linux" case
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9969080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/remoting_me2me_host.cc | 6 | ||||
| -rw-r--r-- | remoting/host/simple_host_process.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc index d5cd222..adb79f9 100644 --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc @@ -42,7 +42,7 @@ #include "remoting/jingle_glue/xmpp_signal_strategy.h" #include "remoting/protocol/me2me_host_authenticator_factory.h" -#if defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_GTK) #include "ui/gfx/gtk_util.h" #endif @@ -358,12 +358,12 @@ int main(int argc, char** argv) { const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); -#if defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_GTK) // Required for any calls into GTK functions, such as the Disconnect and // Continue windows, though these should not be used for the Me2Me case // (crbug.com/104377). gfx::GtkInitFromCommandLine(*cmd_line); -#endif // TOOLKIT_USES_GTK +#endif // TOOLKIT_GTK remoting::HostProcess me2me_host; me2me_host.InitWithCommandLine(cmd_line); diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc index eda7fa7..2818eea 100644 --- a/remoting/host/simple_host_process.cc +++ b/remoting/host/simple_host_process.cc @@ -50,7 +50,7 @@ #include "remoting/protocol/it2me_host_authenticator_factory.h" #include "remoting/protocol/me2me_host_authenticator_factory.h" -#if defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_GTK) #include "ui/gfx/gtk_util.h" #elif defined(OS_MACOSX) #include "base/mac/scoped_nsautorelease_pool.h" @@ -306,9 +306,9 @@ int main(int argc, char** argv) { base::AtExitManager exit_manager; crypto::EnsureNSPRInit(); -#if defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_GTK) gfx::GtkInitFromCommandLine(*cmd_line); -#endif // TOOLKIT_USES_GTK +#endif // TOOLKIT_GTK remoting::SimpleHost simple_host; |