chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc - Issue 24108003: [Cleanup] Rename WindowSettings to WindowState

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc

Issue 24108003: [Cleanup] Rename WindowSettings to WindowState (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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

« ash/wm/workspace_controller_unittest.cc ('K') | « chrome/browser/ui/ash/launcher/launcher_context_menu.cc ('k') | chrome/browser/ui/ash/window_positioner.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc

diff --git a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc

index 5eaf111194e48853148c55576e7476e30f089ed2..1e4109330eaf6b607be0d7bdd7cfd2da97e1dff4 100644

--- a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc

+++ b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc

@@ -6,7 +6,7 @@

#include "apps/native_app_window.h"

#include "apps/shell_window.h"

-#include "ash/wm/window_settings.h"

+#include "ash/wm/window_state.h"

#include "ash/wm/window_util.h"

#include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"

#include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h"

@@ -147,7 +147,7 @@ void ShellWindowLauncherItemController::Clicked(const ui::Event& event) {

aura::Window* panel_window = panel->GetNativeWindow();

// If the panel is attached on another display, move it to the current

// display and activate it.

- if (ash::wm::GetWindowSettings(panel_window)->panel_attached() &&

+ if (ash::wm::GetWindowState(panel_window)->panel_attached() &&

ash::wm::MoveWindowToEventRoot(panel_window, event)) {

if (!panel->GetBaseWindow()->IsActive())

ShowAndActivateOrMinimize(panel);