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

Unified Diff: chrome/browser/chromeos/setting_level_bubble.cc

Issue 8604012: move chromeos bubble setup code to window.cc (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: update 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
« no previous file with comments | « no previous file | ui/views/bubble/bubble_delegate.h » ('j') | ui/views/bubble/bubble_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/setting_level_bubble.cc
diff --git a/chrome/browser/chromeos/setting_level_bubble.cc b/chrome/browser/chromeos/setting_level_bubble.cc
index f1052c533938452c395e0da494a6801bd9c70882..0db5d9e055fbfddc0e56f0a84e84459f367c5eb9 100644
--- a/chrome/browser/chromeos/setting_level_bubble.cc
+++ b/chrome/browser/chromeos/setting_level_bubble.cc
@@ -21,11 +21,6 @@
#include "ui/views/layout/fill_layout.h"
#include "views/widget/root_view.h"
-#if !defined(USE_AURA)
-#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
-#include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
-#endif
-
using base::TimeDelta;
using base::TimeTicks;
using std::max;
@@ -97,6 +92,7 @@ SettingLevelBubbleDelegateView::SettingLevelBubbleDelegateView()
view_(NULL) {
set_close_on_esc(false);
set_use_focusless(true);
+ set_show_while_screen_is_locked(true);
}
SettingLevelBubbleDelegateView::~SettingLevelBubbleDelegateView() {
@@ -190,18 +186,6 @@ SettingLevelBubbleView* SettingLevelBubble::CreateView() {
SettingLevelBubbleDelegateView* delegate = new SettingLevelBubbleDelegateView;
views::Widget* widget = views::BubbleDelegateView::CreateBubble(delegate);
widget->AddObserver(this);
-
-#if !defined(USE_AURA)
- {
- std::vector<int> params;
- params.push_back(1); // show_while_screen_is_locked_
- chromeos::WmIpc::instance()->SetWindowType(
- widget->GetNativeView(),
- chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE,
- &params);
- }
-#endif
-
// Hold on to the content view.
return delegate->view();
}
« no previous file with comments | « no previous file | ui/views/bubble/bubble_delegate.h » ('j') | ui/views/bubble/bubble_delegate.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698