ui/aura/window.cc - Issue 8968022: Shell related switches -> aura shell switches.

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: ui/aura/window.cc

Issue 8968022: Shell related switches -> aura shell switches. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ui/aura/window.cc

===================================================================

--- ui/aura/window.cc (revision 114849)

+++ ui/aura/window.cc (working copy)

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

#include "ui/aura/root_window.h"

#include "ui/aura/window_delegate.h"

#include "ui/aura/window_observer.h"

-#include "ui/aura/window_types.h"

#include "ui/base/animation/multi_animation.h"

#include "ui/gfx/canvas_skia.h"

#include "ui/gfx/compositor/compositor.h"

@@ -37,7 +36,7 @@

} // namespace

Window::Window(WindowDelegate* delegate)

- : type_(WINDOW_TYPE_UNKNOWN),

+ : type_(client::WINDOW_TYPE_UNKNOWN),

delegate_(delegate),

parent_(NULL),

transient_parent_(NULL),

@@ -95,7 +94,7 @@

RootWindow::GetInstance()->WindowInitialized(this);

}

-void Window::SetType(WindowType type) {

+void Window::SetType(client::WindowType type) {

// Cannot change type after the window is initialized.

DCHECK(!layer());

type_ = type;

« no previous file with comments | « ui/aura/window.h ('k') | ui/aura/window_types.h » ('j') | no next file with comments »