Commit f63d1807 authored by sadrul@chromium.org's avatar sadrul@chromium.org

Use the non-touch popup frame instead of NULL.

While this change isn't really all that usable in chrome itself, it fixes a
number of the tests in browser_tests and ui_tests, and fixes a crash in some
other tests to unmask other failures.

BUG=none
TEST=some failing tests (e.g. BrowserNavigatorTest.*) should pass on the touch buildbot.

Review URL: http://codereview.chromium.org/7064035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86530 0039d316-1c4b-4281-b951-d872f2087c98
parent a999b44c
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "chrome/browser/ui/touch/frame/touch_browser_frame_view.h" #include "chrome/browser/ui/touch/frame/touch_browser_frame_view.h"
#include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/frame/popup_non_client_frame_view.h"
namespace browser { namespace browser {
...@@ -15,7 +16,7 @@ BrowserNonClientFrameView* CreateBrowserNonClientFrameView( ...@@ -15,7 +16,7 @@ BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
browser_view->IsBrowserTypePanel()) { browser_view->IsBrowserTypePanel()) {
// TODO(anicolao): implement popups for touch // TODO(anicolao): implement popups for touch
NOTIMPLEMENTED(); NOTIMPLEMENTED();
return NULL; return new PopupNonClientFrameView(frame);
} else { } else {
return new TouchBrowserFrameView(frame, browser_view); return new TouchBrowserFrameView(frame, browser_view);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment