← Back to branch summary

~osomon/oxide/context-menu

« back to all changes in this revision

Viewing changes to shared/browser/oxide_browser_process_main.cc

  • Committer: Olivier Tilloy
  • Date: 2015-05-15 15:03:10 UTC
  • mfrom: (1031.1.47 oxide)
  • Revision ID: olivier.tilloy@canonical.com-20150515150310-8ouquayib3ihi7ca
Merge the latest changes from trunk and resolve a conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/browser/oxide_browser_process_main.cc
55
55
#endif
56
56
#include "gpu/command_buffer/service/gpu_switches.h"
57
57
#include "ipc/ipc_descriptors.h"
 
58
#include "media/base/media_switches.h"
58
59
#include "ui/base/ui_base_paths.h"
59
60
#include "ui/base/ui_base_switches.h"
60
61
#include "ui/gl/gl_switches.h"
317
318
      command_line->AppendSwitch(switches::kEnableMediaHubAudio);
318
319
    }
319
320
  }
 
321
 
 
322
  if (IsEnvironmentOptionEnabled("TESTING_MODE")) {
 
323
    command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
 
324
  }
320
325
}
321
326
 
322
327
void AddFormFactorSpecificCommandLineArguments() {