summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/theme/theme_resources_large.grd16
-rw-r--r--chrome/app/theme/theme_resources_standard.grd16
-rw-r--r--chrome/browser/chromeos/login/existing_user_controller.cc2
-rw-r--r--chrome/browser/chromeos/login/message_bubble.cc4
-rw-r--r--chrome/browser/chromeos/login/message_bubble.h4
-rw-r--r--chrome/browser/chromeos/login/screen_locker.cc11
-rw-r--r--chrome/browser/chromeos/login/screen_locker_views.cc22
-rw-r--r--chrome/browser/chromeos/login/webui_login_view.cc5
-rw-r--r--chrome/browser/extensions/extension_tabs_apitest.cc36
-rw-r--r--chrome/browser/tab_contents/tab_contents_ssl_helper.cc3
-rw-r--r--chrome/browser/task_manager/task_manager_browsertest.cc2
-rw-r--r--chrome/browser/ui/browser_list_unittest.cc10
-rw-r--r--chrome/browser/ui/webui/options/options_browsertest.js3
-rw-r--r--chrome/chrome_tests.gypi6
-rw-r--r--ui/resources/ui_resources.grd7
15 files changed, 18 insertions, 129 deletions
diff --git a/chrome/app/theme/theme_resources_large.grd b/chrome/app/theme/theme_resources_large.grd
index 602db92..c3b5a7c 100644
--- a/chrome/app/theme/theme_resources_large.grd
+++ b/chrome/app/theme/theme_resources_large.grd
@@ -87,18 +87,10 @@
<include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="large_keyword_search_bubble_c.png" type="BINDATA" />
<include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="large_keyword_search_bubble_l.png" type="BINDATA" />
<include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="large_keyword_search_bubble_r.png" type="BINDATA" />
- <if expr="not pp_ifdef('touchui')">
- <include name="IDR_NEWTAB_BUTTON" file="large_newtab.png" type="BINDATA" />
- <include name="IDR_NEWTAB_BUTTON_H" file="large_newtab_h.png" type="BINDATA" />
- <include name="IDR_NEWTAB_BUTTON_MASK" file="large_newtab_button_mask.png" type="BINDATA" />
- <include name="IDR_NEWTAB_BUTTON_P" file="large_newtab_p.png" type="BINDATA" />
- </if>
- <if expr="pp_ifdef('touchui')">
- <include name="IDR_NEWTAB_BUTTON" file="touch_newtab.png" type="BINDATA" />
- <include name="IDR_NEWTAB_BUTTON_H" file="touch_newtab_h.png" type="BINDATA" />
- <include name="IDR_NEWTAB_BUTTON_MASK" file="touch_newtab_button_mask.png" type="BINDATA" />
- <include name="IDR_NEWTAB_BUTTON_P" file="touch_newtab_p.png" type="BINDATA" />
- </if>
+ <include name="IDR_NEWTAB_BUTTON" file="large_newtab.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_H" file="large_newtab_h.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_MASK" file="large_newtab_button_mask.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_P" file="large_newtab_p.png" type="BINDATA" />
<include name="IDR_SETTINGS_FAVICON" file="large_settings_favicon.png" type="BINDATA" />
<include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="large_ev_bubble_c.png" type="BINDATA" />
<include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="large_ev_bubble_l.png" type="BINDATA" />
diff --git a/chrome/app/theme/theme_resources_standard.grd b/chrome/app/theme/theme_resources_standard.grd
index 103ecb9..3b57b5b 100644
--- a/chrome/app/theme/theme_resources_standard.grd
+++ b/chrome/app/theme/theme_resources_standard.grd
@@ -90,18 +90,10 @@
<include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="keyword_search_bubble_c.png" type="BINDATA" />
<include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="keyword_search_bubble_l.png" type="BINDATA" />
<include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="keyword_search_bubble_r.png" type="BINDATA" />
- <if expr="not pp_ifdef('touchui')">
- <include name="IDR_NEWTAB_BUTTON" file="newtab.png" type="BINDATA" />
- <include name="IDR_NEWTAB_BUTTON_H" file="newtab_h.png" type="BINDATA" />
- <include name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask.png" type="BINDATA" />
- <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p.png" type="BINDATA" />
- </if>
- <if expr="pp_ifdef('touchui')">
- <include name="IDR_NEWTAB_BUTTON" file="touch_newtab.png" type="BINDATA" />
- <include name="IDR_NEWTAB_BUTTON_H" file="touch_newtab_h.png" type="BINDATA" />
- <include name="IDR_NEWTAB_BUTTON_MASK" file="touch_newtab_button_mask.png" type="BINDATA" />
- <include name="IDR_NEWTAB_BUTTON_P" file="touch_newtab_p.png" type="BINDATA" />
- </if>
+ <include name="IDR_NEWTAB_BUTTON" file="newtab.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_H" file="newtab_h.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask.png" type="BINDATA" />
+ <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p.png" type="BINDATA" />
<include name="IDR_SETTINGS_FAVICON" file="settings_favicon.png" type="BINDATA" />
<include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="ev_bubble_c.png" type="BINDATA" />
<include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="ev_bubble_l.png" type="BINDATA" />
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index 74ab5af..59eb1dd 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -406,7 +406,6 @@ void ExistingUserController::OnProfilePrepared(Profile* profile) {
// TODO(nkostylev): May add login UI implementation callback call.
if (!ready_for_browser_launch_) {
// Add the appropriate first-login URL.
-#if !defined(TOUCH_UI)
PrefService* prefs = g_browser_process->local_state();
const std::string current_locale =
StringToLowerASCII(prefs->GetString(prefs::kApplicationLocale));
@@ -421,7 +420,6 @@ void ExistingUserController::OnProfilePrepared(Profile* profile) {
start_url = base::StringPrintf(url, current_locale.c_str());
}
CommandLine::ForCurrentProcess()->AppendArg(start_url);
-#endif
ServicesCustomizationDocument* customization =
ServicesCustomizationDocument::GetInstance();
diff --git a/chrome/browser/chromeos/login/message_bubble.cc b/chrome/browser/chromeos/login/message_bubble.cc
index f526dd9..91e11d1 100644
--- a/chrome/browser/chromeos/login/message_bubble.cc
+++ b/chrome/browser/chromeos/login/message_bubble.cc
@@ -177,7 +177,7 @@ MessageBubble* MessageBubble::ShowNoGrab(
return bubble;
}
-#if !defined(TOUCH_UI) && defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_USES_GTK)
// TODO(saintlou): Unclear if we need this for the !gtk case.
void MessageBubble::OnActiveChanged() {
if (parent_ && IsActive()) {
@@ -198,7 +198,7 @@ void MessageBubble::Close() {
Bubble::Close();
}
-#if !defined(TOUCH_UI) && defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_USES_GTK)
gboolean MessageBubble::OnButtonPress(GtkWidget* widget,
GdkEventButton* event) {
NativeWidgetGtk::OnButtonPress(widget, event);
diff --git a/chrome/browser/chromeos/login/message_bubble.h b/chrome/browser/chromeos/login/message_bubble.h
index ecdf775..7d57251 100644
--- a/chrome/browser/chromeos/login/message_bubble.h
+++ b/chrome/browser/chromeos/login/message_bubble.h
@@ -77,7 +77,7 @@ class MessageBubble : public Bubble,
// Overridden from NativeWidgetGtk/NativeWidgetViews.
virtual void Close() OVERRIDE;
-#if !defined(TOUCH_UI) && defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_USES_GTK)
virtual gboolean OnButtonPress(GtkWidget* widget,
GdkEventButton* event) OVERRIDE;
#endif
@@ -92,7 +92,7 @@ class MessageBubble : public Bubble,
// Overridden from views::LinkListener:
virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
-#if !defined(TOUCH_UI) && defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_USES_GTK)
// Overridden from NativeWidgetGtk.
virtual void OnActiveChanged() OVERRIDE;
virtual void SetMouseCapture() OVERRIDE;
diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc
index c16da71..6e13b98 100644
--- a/chrome/browser/chromeos/login/screen_locker.cc
+++ b/chrome/browser/chromeos/login/screen_locker.cc
@@ -356,18 +356,7 @@ void ScreenLocker::Show() {
VLOG(1) << "Show: Locking screen";
ScreenLocker* locker =
new ScreenLocker(UserManager::Get()->logged_in_user());
-#if defined(TOUCH_UI)
- // The views screen locker does not reliably work on TOUCH_UI builds. In
- // order to effectively "lock" the screen we will sign out the user for now.
- // TODO(flackr): Implement lock screen in WebUI and remove this hack
- // (crbug.com/105267).
- if (ScreenLocker::UseWebUILockScreen())
- locker->Init();
- else
- locker->Signout();
-#else
locker->Init();
-#endif
} else {
// PowerManager re-sends lock screen signal if it doesn't
// receive the response within timeout. Just send complete
diff --git a/chrome/browser/chromeos/login/screen_locker_views.cc b/chrome/browser/chromeos/login/screen_locker_views.cc
index 4e3034c..6740bcf 100644
--- a/chrome/browser/chromeos/login/screen_locker_views.cc
+++ b/chrome/browser/chromeos/login/screen_locker_views.cc
@@ -503,15 +503,6 @@ class InputEventObserver : public MessageLoopForUI::Observer {
activated_(false) {
}
-#if defined(TOUCH_UI)
- virtual base::EventStatus WillProcessEvent(
- const base::NativeEvent& event) OVERRIDE {
- return base::EVENT_CONTINUE;
- }
-
- virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE {
- }
-#else
virtual void WillProcessEvent(GdkEvent* event) OVERRIDE {
if ((event->type == GDK_KEY_PRESS ||
event->type == GDK_BUTTON_PRESS ||
@@ -530,7 +521,6 @@ class InputEventObserver : public MessageLoopForUI::Observer {
virtual void DidProcessEvent(GdkEvent* event) OVERRIDE {
}
-#endif
private:
chromeos::ScreenLocker* screen_locker_;
@@ -553,15 +543,6 @@ class LockerInputEventObserver : public MessageLoopForUI::Observer {
&LockerInputEventObserver::StartScreenSaver)) {
}
-#if defined(TOUCH_UI)
- virtual base::EventStatus WillProcessEvent(
- const base::NativeEvent& event) OVERRIDE {
- return base::EVENT_CONTINUE;
- }
-
- virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE {
- }
-#else
virtual void WillProcessEvent(GdkEvent* event) OVERRIDE {
if ((event->type == GDK_KEY_PRESS ||
event->type == GDK_BUTTON_PRESS ||
@@ -573,7 +554,6 @@ class LockerInputEventObserver : public MessageLoopForUI::Observer {
virtual void DidProcessEvent(GdkEvent* event) OVERRIDE {
}
-#endif
private:
void StartScreenSaver() {
@@ -906,14 +886,12 @@ void ScreenLockerViews::ShowErrorBubble(
UTF16ToWide(string16()), // TODO(nkostylev): Add help link.
this);
-#if !defined(TOUCH_UI)
if (mouse_event_relay_.get())
MessageLoopForUI::current()->RemoveObserver(mouse_event_relay_.get());
mouse_event_relay_.reset(
new MouseEventRelay(lock_widget_->GetNativeView()->window,
error_info_->GetNativeView()->window));
MessageLoopForUI::current()->AddObserver(mouse_event_relay_.get());
-#endif
}
bool ScreenLockerViews::AcceleratorPressed(
diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc
index 4e03888..1da9cfc 100644
--- a/chrome/browser/chromeos/login/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/webui_login_view.cc
@@ -332,16 +332,11 @@ void WebUILoginView::InitStatusArea() {
width() - widget_size.width() - kStatusAreaCornerPadding;
gfx::Rect widget_bounds(widget_x, kStatusAreaCornerPadding,
widget_size.width(), widget_size.height());
-#if defined(TOUCH_UI)
- views::Widget::InitParams widget_params(
- views::Widget::InitParams::TYPE_CONTROL);
-#else
// TODO(nkostylev|oshima): Make status area in the same window as
// |webui_login_| once RenderWidgetHostViewViews and compositor are
// ready.
views::Widget::InitParams widget_params(
views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
-#endif
widget_params.bounds = widget_bounds;
widget_params.transparent = true;
widget_params.parent_widget = login_window_;
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc
index 3dbf72a..816d976 100644
--- a/chrome/browser/extensions/extension_tabs_apitest.cc
+++ b/chrome/browser/extensions/extension_tabs_apitest.cc
@@ -41,34 +41,6 @@
#endif
-// In the touch build, this fails reliably. http://crbug.com/85191
-#if defined(TOUCH_UI)
-#define MAYBE_GetViewsOfCreatedWindow DISABLED_GetViewsOfCreatedWindow
-#else
-#define MAYBE_GetViewsOfCreatedWindow GetViewsOfCreatedWindow
-#endif
-
-// In the touch build, this fails unreliably. http://crbug.com/85226
-#if defined(TOUCH_UI)
-#define MAYBE_GetViewsOfCreatedPopup FLAKY_GetViewsOfCreatedPopup
-#else
-#define MAYBE_GetViewsOfCreatedPopup GetViewsOfCreatedPopup
-#endif
-
-// In the touch build, this fails reliably. http://crbug.com/85190
-#if defined(TOUCH_UI)
-#define MAYBE_TabEvents DISABLED_TabEvents
-#else
-#define MAYBE_TabEvents TabEvents
-#endif
-
-// In the touch build, this fails unreliably. http://crbug.com/85193
-#if defined(TOUCH_UI)
-#define MAYBE_TabMove FLAKY_TabMove
-#else
-#define MAYBE_TabMove TabMove
-#endif
-
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Tabs) {
// The test creates a tab and checks that the URL of the new tab
// is that of the new tab page. Make sure the pref that controls
@@ -91,11 +63,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabPinned) {
ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "pinned.html")) << message_;
}
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabMove) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabMove) {
ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "move.html")) << message_;
}
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabEvents) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabEvents) {
ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "events.html")) << message_;
}
@@ -228,11 +200,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoDisabledByPref) {
ASSERT_TRUE(RunExtensionTest("tabs/incognito_disabled")) << message_;
}
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_GetViewsOfCreatedPopup) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViewsOfCreatedPopup) {
ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_popup.html"))
<< message_;
}
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_GetViewsOfCreatedWindow) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViewsOfCreatedWindow) {
ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html"))
<< message_;
}
diff --git a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc
index 3e838b4..ed544c2 100644
--- a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc
+++ b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc
@@ -248,11 +248,8 @@ void TabContentsSSLHelper::SelectClientCertificate(
void TabContentsSSLHelper::ShowClientCertificateRequestDialog(
scoped_refptr<SSLClientAuthHandler> handler) {
- // TODO(rhashimoto): WebUI certificate selector for touch.
-#if !defined(TOUCH_UI)
browser::ShowSSLClientCertificateSelector(
tab_contents_, handler->cert_request_info(), handler);
-#endif
}
void TabContentsSSLHelper::OnVerifyClientCertificateError(
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
index cdf5391..0271729 100644
--- a/chrome/browser/task_manager/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -39,8 +39,6 @@
// In some environments this test fails about 1/6 http://crbug/84850
#if defined(OS_LINUX)
#define MAYBE_KillExtension DISABLED_KillExtension
-#elif defined(TOUCH_UI)
-#define MAYBE_KillExtension FLAKY_KillExtension
#else
#define MAYBE_KillExtension KillExtension
#endif
diff --git a/chrome/browser/ui/browser_list_unittest.cc b/chrome/browser/ui/browser_list_unittest.cc
index abb7077..b0fd9ee 100644
--- a/chrome/browser/ui/browser_list_unittest.cc
+++ b/chrome/browser/ui/browser_list_unittest.cc
@@ -4,10 +4,6 @@
#include "chrome/browser/printing/background_printing_manager.h"
#include "chrome/browser/ui/browser_list.h"
-#if defined(TOUCH_UI)
-// TODO(alicet): clean up dependency on defaults when max tab count is removed.
-#include "chrome/browser/defaults.h"
-#endif
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/base/browser_with_test_window_test.h"
@@ -78,13 +74,7 @@ TEST_F(BrowserListTest, TabContentsIteratorVerifyCount) {
for (size_t i = 0; i < 41; ++i)
browser()->NewTab();
-#if defined(TOUCH_UI)
- // TODO(alicet): clean up max tab count.
- size_t max_tab_count = browser_defaults::kMaxTabCount;
- EXPECT_EQ(max_tab_count + 1U, CountAllTabs());
-#else
EXPECT_EQ(42U, CountAllTabs());
-#endif
// Close all remaining tabs to keep all the destructors happy.
browser3->CloseAllTabs();
}
diff --git a/chrome/browser/ui/webui/options/options_browsertest.js b/chrome/browser/ui/webui/options/options_browsertest.js
index 92cd99b..9be9041 100644
--- a/chrome/browser/ui/webui/options/options_browsertest.js
+++ b/chrome/browser/ui/webui/options/options_browsertest.js
@@ -71,8 +71,7 @@ TEST_F('OptionsWebUITest', 'MAYBE_testSetBooleanPrefTriggers', function() {
// Not meant to run on ChromeOS at this time.
// Not finishing in windows. http://crbug.com/81723
-GEN('#if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) \\');
-GEN(' || defined(TOUCH_UI)');
+GEN('#if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN)');
GEN('#define MAYBE_testRefreshStaysOnCurrentPage \\');
GEN(' DISABLED_testRefreshStaysOnCurrentPage');
GEN('#else');
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 4663c50..5f70b24 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2083,12 +2083,6 @@
['exclude', '^browser/bookmarks/bookmark_node_data_unittest.cc'],
],
}],
- ['touchui==0', {
- 'sources/': [
- ['exclude', '^browser/ui/touch/'],
- ['exclude', '^browser/ui/webui/chromeos/login/'],
- ],
- }],
['file_manager_extension==0', {
'sources!': [
'browser/ui/views/select_file_dialog_extension_unittest.cc',
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index bd875e7..ac5884c 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -100,12 +100,7 @@
<include name="IDR_TEXTBUTTON_TOP_P" file="textbutton_t_p.png" type="BINDATA" />
<include name="IDR_TEXTBUTTON_TOP_RIGHT_H" file="textbutton_tr_h.png" type="BINDATA" />
<include name="IDR_TEXTBUTTON_TOP_RIGHT_P" file="textbutton_tr_p.png" type="BINDATA" />
- <if expr="not pp_ifdef('touchui')">
- <include name="IDR_THROBBER" file="throbber.png" type="BINDATA" />
- </if>
- <if expr="pp_ifdef('touchui')">
- <include name="IDR_THROBBER" file="large_throbber.png" type="BINDATA" />
- </if>
+ <include name="IDR_THROBBER" file="throbber.png" type="BINDATA" />
<include name="IDR_WINDOW_BOTTOM_CENTER" file="window_bottom_center.png" type="BINDATA" />
<include name="IDR_WINDOW_BOTTOM_LEFT_CORNER" file="window_bottom_left_corner.png" type="BINDATA" />
<include name="IDR_WINDOW_BOTTOM_RIGHT_CORNER" file="window_bottom_right_corner.png" type="BINDATA" />
generated by cgit v1.1 at 2025-03-01 10:15:52 +0000