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

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

Issue 8650001: Move ChromeOS bubble setup code to window.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | chrome/browser/speech/speech_input_bubble_views.cc » ('j') | no next file with comments »
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 532a59230b0e13e80e7593f59eb2b547d1f009f1..250d333da841361e8fd7abeb15078f3c086fff3d 100644
--- a/chrome/browser/chromeos/setting_level_bubble.cc
+++ b/chrome/browser/chromeos/setting_level_bubble.cc
@@ -16,16 +16,12 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/views/window.h"
#include "ui/gfx/screen.h"
#include "ui/views/bubble/bubble_delegate.h"
#include "ui/views/layout/fill_layout.h"
#include "ui/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;
@@ -188,20 +184,8 @@ void SettingLevelBubble::OnWidgetClosing(views::Widget* widget) {
SettingLevelBubbleView* SettingLevelBubble::CreateView() {
SettingLevelBubbleDelegateView* delegate = new SettingLevelBubbleDelegateView;
- views::Widget* widget = views::BubbleDelegateView::CreateBubble(delegate);
+ views::Widget* widget = browser::CreateViewsBubbleAboveLockScreen(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 | chrome/browser/speech/speech_input_bubble_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698