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

Issue 10262002: views: Get rid of CreateViewsBubbleAboveLockScreen() function. (Closed)

Created:
8 years, 7 months ago by tfarina
Modified:
8 years, 7 months ago
CC:
chromium-reviews, stevenjb+watch_chromium.org, nkostylev+watch_chromium.org, davemoore+watch_chromium.org
Visibility:
Public.

Description

views: Get rid of CreateViewsBubbleAboveLockScreen() function. Instead just fold it into the callers. This functions is just called twice, and there is no good reason to keep it around in window.h. Which we plan to get rid of. R=ben@chromium.org TBR=stevenjb@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=134485

Patch Set 1 : #

Unified diffs Side-by-side diffs Delta from patch set Stats (+10 lines, -30 lines) Patch
M chrome/browser/chromeos/status/data_promo_notification.cc View 2 chunks +6 lines, -1 line 0 comments Download
M chrome/browser/chromeos/ui/setting_level_bubble.cc View 2 chunks +4 lines, -1 line 0 comments Download
M chrome/browser/ui/views/window.h View 2 chunks +0 lines, -8 lines 0 comments Download
M chrome/browser/ui/views/window.cc View 2 chunks +0 lines, -19 lines 0 comments Download
M chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc View 1 chunk +0 lines, -1 line 0 comments Download

Messages

Total messages: 2 (0 generated)
tfarina
8 years, 7 months ago (2012-04-28 16:29:16 UTC) #1
Ben Goodger (Google)
8 years, 7 months ago (2012-04-28 18:54:38 UTC) #2
LGTM

On Sat, Apr 28, 2012 at 9:29 AM, <tfarina@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> views: Get rid of CreateViewsBubbleAboveLockScre**en() function.
>
> Instead just fold it into the callers. This functions is just called
> twice, and
> there is no good reason to keep it around in window.h. Which we plan to
> get rid
> of.
>
> R=ben@chromium.org
>
>
> Please review this at
http://codereview.chromium.**org/10262002/<http://codereview.chromium.org/102...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>  M chrome/browser/chromeos/**status/data_promo_**notification.cc
>  M chrome/browser/chromeos/ui/**setting_level_bubble.cc
>  M chrome/browser/ui/views/**window.h
>  M chrome/browser/ui/views/**window.cc
>  M chrome/browser/ui/webui/**options2/chromeos/set_**
> wallpaper_options_handler2.cc
>
>
> Index: chrome/browser/chromeos/**status/data_promo_**notification.cc
> diff --git a/chrome/browser/chromeos/**status/data_promo_**notification.cc
> b/chrome/browser/chromeos/**status/data_promo_**notification.cc
> index 553336c2f571fea70150ec3a4eb047**6b51d33ec8..**
> 5182451db34c881e857ba5551e28a8**c7d8ef13a9 100644
> --- a/chrome/browser/chromeos/**status/data_promo_**notification.cc
> +++ b/chrome/browser/chromeos/**status/data_promo_**notification.cc
> @@ -4,6 +4,8 @@
>
>  #include "chrome/browser/chromeos/**status/data_promo_**notification.h"
>
> +#include "ash/shell.h"
> +#include "ash/shell_window_ids.h"
>  #include "base/utf_string_conversions.**h"
>  #include "chrome/browser/browser_**process.h"
>  #include "chrome/browser/chromeos/cros/**cros_library.h"
> @@ -206,7 +208,10 @@ void DataPromoNotification::**
> ShowOptionalMobileDataPromoNot**ification(
>         message,
>         links);
>     mobile_data_bubble_->set_link_**listener(listener);
> -    browser::**CreateViewsBubbleAboveLockScre**en(mobile_data_bubble_);
> +    mobile_data_bubble_->set_**parent_window(
> +        ash::Shell::GetInstance()->**GetContainer(
> +            ash::internal::kShellWindowId_**SettingBubbleContainer));
> +    views::BubbleDelegateView::**CreateBubble(mobile_data_**bubble_);
>     mobile_data_bubble_->Show();
>     mobile_data_bubble_->**GetWidget()->AddObserver(this)**;
>
> Index: chrome/browser/chromeos/ui/**setting_level_bubble.cc
> diff --git a/chrome/browser/chromeos/ui/**setting_level_bubble.cc
> b/chrome/browser/chromeos/ui/**setting_level_bubble.cc
> index a673f47b754e06a6e63ce827466162**39b0551ff4..**
> 5de49eb6ee08cf7f0fa5cd015695be**5b536cb9e8 100644
> --- a/chrome/browser/chromeos/ui/**setting_level_bubble.cc
> +++ b/chrome/browser/chromeos/ui/**setting_level_bubble.cc
> @@ -7,6 +7,7 @@
>  #include <algorithm>
>
>  #include "ash/shell.h"
> +#include "ash/shell_window_ids.h"
>  #include "chrome/browser/chromeos/**login/base_login_display_host.**h"
>  #include "chrome/browser/chromeos/**login/login_display_host.h"
>  #include "chrome/browser/chromeos/**login/login_utils.h"
> @@ -188,7 +189,9 @@ void SettingLevelBubble::**OnWidgetClosing(views::Widget*
> widget) {
>
>  SettingLevelBubbleView* SettingLevelBubble::**CreateView() {
>   SettingLevelBubbleDelegateView*** delegate = new
> SettingLevelBubbleDelegateView**;
> -  views::Widget* widget = browser::**CreateViewsBubbleAboveLockScre**
> en(delegate);
> +  delegate->set_parent_window(**ash::Shell::GetInstance()->**
> GetContainer(
> +      ash::internal::kShellWindowId_**SettingBubbleContainer));
> +  views::Widget* widget = views::BubbleDelegateView::**
> CreateBubble(delegate);
>   widget->AddObserver(this);
>   // Hold on to the content view.
>   return delegate->view();
> Index: chrome/browser/ui/views/**window.cc
> diff --git a/chrome/browser/ui/views/**window.cc
> b/chrome/browser/ui/views/**window.cc
> index ae19970857ed1e4800d974d0407324**6db50955cf..**
> a02ed73978dc8b8bf0b545f25f1562**ef7f3d92bb 100644
> --- a/chrome/browser/ui/views/**window.cc
> +++ b/chrome/browser/ui/views/**window.cc
> @@ -7,13 +7,6 @@
>  #include "ui/views/bubble/bubble_**delegate.h"
>  #include "ui/views/widget/widget.h"
>
> -#if defined(USE_AURA)
> -#include "ash/shell.h"
> -#include "ash/shell_window_ids.h"
> -#include "ui/aura/root_window.h"
> -#include "ui/aura/window.h"
> -#endif
> -
>  // Note: This file should be removed after the old ChromeOS frontend is
> removed.
>  //       It is not needed for Aura.
>  //       The visual style implemented by BubbleFrameView/BubbleWindow for
> @@ -40,16 +33,4 @@ views::Widget*
CreateFramelessViewsWindow(**gfx::NativeWindow
> parent,
>   return widget;
>  }
>
> -views::Widget* CreateViewsBubbleAboveLockScre**en(
> -    views::BubbleDelegateView* delegate) {
> -#if defined(USE_AURA)
> -  delegate->set_parent_window(
> -      ash::Shell::GetInstance()->**GetContainer(
> -          ash::internal::kShellWindowId_**SettingBubbleContainer));
> -#endif
> -  views::Widget* bubble_widget =
> -      views::BubbleDelegateView::**CreateBubble(delegate);
> -  return bubble_widget;
> -}
> -
>  }  // namespace browser
> Index: chrome/browser/ui/views/**window.h
> diff --git a/chrome/browser/ui/views/**window.h b/chrome/browser/ui/views/
> **window.h
> index bfb116a27824af5bfdf9fd314b7fb9**03315c76e2..**
> 5a242af7c48208402f2f695bcdbd03**13d3fe4076 100644
> --- a/chrome/browser/ui/views/**window.h
> +++ b/chrome/browser/ui/views/**window.h
> @@ -9,7 +9,6 @@
>  #include "ui/gfx/native_widget_types.h"
>
>  namespace views {
> -class BubbleDelegateView;
>  class Widget;
>  class WidgetDelegate;
>  }
> @@ -20,13 +19,6 @@ namespace browser {
>  views::Widget* CreateFramelessViewsWindow(**gfx::NativeWindow parent,
>                                           views::WidgetDelegate* delegate);
>
> -// Create a bubble that will show even when chromeos screen is locked,
> -// for a given |delegate|. Takes care of chromeos specific window
> -// type setting. For bubbles that do not need to be shown when screen
> -// is locked, use CreateViewsBubble instead.
> -views::Widget* CreateViewsBubbleAboveLockScre**en(
> -    views::BubbleDelegateView* delegate);
> -
>  }  // namespace browser
>
>  #endif  // CHROME_BROWSER_UI_VIEWS_**WINDOW_H_
> Index: chrome/browser/ui/webui/**options2/chromeos/set_**
> wallpaper_options_handler2.cc
> diff --git
a/chrome/browser/ui/webui/**options2/chromeos/set_**wallpaper_options_handler2.cc
> b/chrome/browser/ui/webui/**options2/chromeos/set_**
> wallpaper_options_handler2.cc
> index 40056a452c1b8b518e31cfbc06afa5**c561648566..**
> c25375835f0fbdd55db7302c0d3645**dbe3970ddf 100644
> --- a/chrome/browser/ui/webui/**options2/chromeos/set_**
> wallpaper_options_handler2.cc
> +++ b/chrome/browser/ui/webui/**options2/chromeos/set_**
> wallpaper_options_handler2.cc
> @@ -18,7 +18,6 @@
>  #include "chrome/browser/profiles/**profile.h"
>  #include "chrome/browser/ui/browser_**list.h"
>  #include "chrome/browser/ui/browser_**window.h"
> -#include "chrome/browser/ui/views/**window.h"
>  #include "chrome/browser/ui/webui/**options2/chromeos/wallpaper_**
> thumbnail_source2.h"
>  #include "chrome/common/chrome_**notification_types.h"
>  #include "content/public/browser/**notification_service.h"
>
>
>

Powered by Google App Engine
This is Rietveld 408576698