summaryrefslogtreecommitdiffstats
path: root/ash/shell.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-11 04:03:40 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-11 04:03:40 +0000
commite4612da65df7f8764f342d0a18edb58e316881aa (patch)
tree0456be800a6775c51583b848fff3e8912c3bf6f4 /ash/shell.cc
parentf5e48efdedc31d00f6a7ccda5be9ed34c11357f6 (diff)
downloadchromium_src-e4612da65df7f8764f342d0a18edb58e316881aa.zip
chromium_src-e4612da65df7f8764f342d0a18edb58e316881aa.tar.gz
chromium_src-e4612da65df7f8764f342d0a18edb58e316881aa.tar.bz2
Revert 117165 - Allow a Views client to provide a default frameview for window widgets.
Provides a default one in Ash that will be used to match kennedy-spec. Much tweaking is needed, but that can come in future CLs. http://crbug.com/109138 TEST=none Review URL: http://codereview.chromium.org/9166014 TBR=ben@chromium.org Review URL: http://codereview.chromium.org/9166035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117168 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
-rw-r--r--ash/shell.cc10
1 files changed, 0 insertions, 10 deletions
diff --git a/ash/shell.cc b/ash/shell.cc
index 7d9863e..c2e04fe 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -22,7 +22,6 @@
#include "ash/wm/compact_status_area_layout_manager.h"
#include "ash/wm/default_container_event_filter.h"
#include "ash/wm/default_container_layout_manager.h"
-#include "ash/wm/dialog_frame_view.h"
#include "ash/wm/modal_container_layout_manager.h"
#include "ash/wm/power_button_controller.h"
#include "ash/wm/root_window_event_filter.h"
@@ -395,15 +394,6 @@ bool Shell::IsModalWindowOpen() const {
return !modal_container->children().empty();
}
-views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView(
- views::Widget* widget) {
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kAuraGoogleDialogFrames)) {
- return new internal::DialogFrameView;
- }
- return NULL;
-}
-
////////////////////////////////////////////////////////////////////////////////
// Shell, private: