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

Unified Diff: chrome/browser/ui/views/apps/native_app_window_views.cc

Issue 24108003: [Cleanup] Rename WindowSettings to WindowState (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase fix Created 7 years, 3 months 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 | « chrome/browser/ui/ash/window_positioner.cc ('k') | chrome/browser/ui/views/frame/browser_frame_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/apps/native_app_window_views.cc
diff --git a/chrome/browser/ui/views/apps/native_app_window_views.cc b/chrome/browser/ui/views/apps/native_app_window_views.cc
index 1a647520a1dbb20aa101a2e5d39c32723f48c747..538042703820680dd7583884f2f11c0034a40c9c 100644
--- a/chrome/browser/ui/views/apps/native_app_window_views.cc
+++ b/chrome/browser/ui/views/apps/native_app_window_views.cc
@@ -44,7 +44,7 @@
#include "ash/shell.h"
#include "ash/wm/custom_frame_view_ash.h"
#include "ash/wm/panels/panel_frame_view.h"
-#include "ash/wm/window_settings.h"
+#include "ash/wm/window_state.h"
#include "chrome/browser/ui/ash/ash_util.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/root_window.h"
@@ -285,7 +285,7 @@ void NativeAppWindowViews::InitializePanelWindow(
preferred_size_.width(),
preferred_size_.height());
aura::Window* native_window = GetNativeWindow();
- ash::wm::GetWindowSettings(native_window)->set_panel_attached(false);
+ ash::wm::GetWindowState(native_window)->set_panel_attached(false);
native_window->SetDefaultParentByRootWindow(
native_window->GetRootWindow(), native_window->GetBoundsInScreen());
window_->SetBounds(window_bounds);
@@ -412,7 +412,7 @@ bool NativeAppWindowViews::IsAlwaysOnTop() const {
if (!shell_window_->window_type_is_panel())
return false;
#if defined(USE_ASH)
- return ash::wm::GetWindowSettings(window_->GetNativeWindow())->
+ return ash::wm::GetWindowState(window_->GetNativeWindow())->
panel_attached();
#else
return true;
@@ -750,8 +750,7 @@ bool NativeAppWindowViews::IsDetached() const {
if (!shell_window_->window_type_is_panel())
return false;
#if defined(USE_ASH)
- return !ash::wm::GetWindowSettings(window_->GetNativeWindow())->
- panel_attached();
+ return !ash::wm::GetWindowState(window_->GetNativeWindow())->panel_attached();
#else
return false;
#endif
« no previous file with comments | « chrome/browser/ui/ash/window_positioner.cc ('k') | chrome/browser/ui/views/frame/browser_frame_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698