ash/wm/dock/docked_window_layout_manager.cc - Issue 97983003: Start the move of launcher_types.h to shelf.

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: ash/wm/dock/docked_window_layout_manager.cc

Issue 97983003: Start the move of launcher_types.h to shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: the rename Created 7 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: ash/wm/dock/docked_window_layout_manager.cc

diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc

index d540b58d279d390f8c18a380ca181cc6cefe2e19..4d72f1b045c08e1b948a55874313d1d4ffe7a537 100644

--- a/ash/wm/dock/docked_window_layout_manager.cc

+++ b/ash/wm/dock/docked_window_layout_manager.cc

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

#include "ash/ash_switches.h"

#include "ash/screen_ash.h"

#include "ash/shelf/shelf.h"

+#include "ash/shelf/shelf_constants.h"

#include "ash/shelf/shelf_layout_manager.h"

#include "ash/shelf/shelf_types.h"

#include "ash/shelf/shelf_widget.h"

@@ -59,7 +60,7 @@ class DockedBackgroundWidget : public views::Widget,

public:

explicit DockedBackgroundWidget(aura::Window* container)

: alignment_(DOCKED_ALIGNMENT_NONE),

- background_animator_(this, 0, kLauncherBackgroundAlpha),

+ background_animator_(this, 0, kShelfBackgroundAlpha),

alpha_(0),

opaque_background_(ui::LAYER_SOLID_COLOR) {

InitWidget(container);