Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5511)

Unified Diff: chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

Issue 7685006: Implement input type=color UI (common part) (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: forgot to turn off flag Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
index 0452e394a6e5b61c9893b75d67726f342ba98098..4d5ed581524c44403358609300f24ced8578c173 100644
--- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
+++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
@@ -14,6 +14,9 @@
#include "chrome/browser/autofill/autofill_manager.h"
#include "chrome/browser/automation/automation_tab_helper.h"
#include "chrome/browser/browser_process.h"
+#if defined(ENABLE_INPUT_COLOR)
+#include "chrome/browser/color_select_helper.h"
+#endif
#include "chrome/browser/content_settings/tab_specific_content_settings.h"
#include "chrome/browser/download/download_request_limiter_observer.h"
#include "chrome/browser/extensions/extension_tab_helper.h"
@@ -286,6 +289,9 @@ TabContentsWrapper::TabContentsWrapper(TabContents* contents)
this, new WebIntentPickerFactoryImpl()));
// Create the per-tab observers.
+#if defined(ENABLE_INPUT_COLOR)
+ color_select_observer_.reset(new ColorSelectObserver(contents));
+#endif // defined(ENABLE_INPUT_COLOR)
download_request_limiter_observer_.reset(
new DownloadRequestLimiterObserver(contents));
webnavigation_observer_.reset(

Powered by Google App Engine
This is Rietveld 408576698