summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
authorzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-22 01:00:21 +0000
committerzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-22 01:00:21 +0000
commit1e40513cce7a4a1de6ccad42f13d77db0e313fde (patch)
tree0b02caff0d2bc7531220e8c0e23969dfc77a3975 /chrome/browser/views
parentaf0b07937eb8c6faea00781ad36c4d5b5acedff6 (diff)
downloadchromium_src-1e40513cce7a4a1de6ccad42f13d77db0e313fde.zip
chromium_src-1e40513cce7a4a1de6ccad42f13d77db0e313fde.tar.gz
chromium_src-1e40513cce7a4a1de6ccad42f13d77db0e313fde.tar.bz2
Checking in CL http://www.codereview.chromium.org/2836058 on behalf of zbehan@:
chrome: create an option for using libcros provided by the system; fix all includes referring to libcros to not include third_party/ * Headers fix is needed to support using system libcros (installed to /usr/include) * All includes are "", and therefore a local variant in third_party/cros/ is always preferred, but system will also get picked up as a secondary target * Fixed chrome/browser/chromeos/cros/synaptics_library.h comments to better reflect the header placement * Added a variable system_libcros defaulting to 0 * Gotten rid of duplicate cros_api.gyp * Changed both places to either link against cros_api or libcrosapi TEST=build in the following scenarios: 1) libcros not installed, libcros sources in third_party/, !defined system_libcros - sucess 2) installed libcros, put #error into /usr/include/cros/chromeos_cros_api.h, repeat 1) - success 3) BUILD_DEFINES+=system_libcros=1, removed libcros from third_party, repeat 2) - fail (on #error in chromeos_cros_api.h) 4) Installed clean libcros, repeat 3) - success Review URL: http://codereview.chromium.org/3043010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/browser_bubble_gtk.cc2
-rw-r--r--chrome/browser/views/extensions/extension_popup.cc2
-rw-r--r--chrome/browser/views/info_bubble.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/views/browser_bubble_gtk.cc b/chrome/browser/views/browser_bubble_gtk.cc
index 63420d2..3bbd61a 100644
--- a/chrome/browser/views/browser_bubble_gtk.cc
+++ b/chrome/browser/views/browser_bubble_gtk.cc
@@ -10,7 +10,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/wm_ipc.h"
-#include "third_party/cros/chromeos_wm_ipc_enums.h"
+#include "cros/chromeos_wm_ipc_enums.h"
#endif
namespace {
diff --git a/chrome/browser/views/extensions/extension_popup.cc b/chrome/browser/views/extensions/extension_popup.cc
index a669d69..f9b1a26 100644
--- a/chrome/browser/views/extensions/extension_popup.cc
+++ b/chrome/browser/views/extensions/extension_popup.cc
@@ -29,7 +29,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/wm_ipc.h"
-#include "third_party/cros/chromeos_wm_ipc_enums.h"
+#include "cros/chromeos_wm_ipc_enums.h"
#endif
using views::Widget;
diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc
index 34645a0..48b7626 100644
--- a/chrome/browser/views/info_bubble.cc
+++ b/chrome/browser/views/info_bubble.cc
@@ -19,7 +19,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/wm_ipc.h"
-#include "third_party/cros/chromeos_wm_ipc_enums.h"
+#include "cros/chromeos_wm_ipc_enums.h"
#endif
// How long the fade should last for.