ash/system/palette/palette_tray.cc - Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1

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/system/palette/palette_tray.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)

Patch Set: rebase Created 3 years, 10 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

Index: ash/system/palette/palette_tray.cc

diff --git a/ash/common/system/chromeos/palette/palette_tray.cc b/ash/system/palette/palette_tray.cc

similarity index 96%

rename from ash/common/system/chromeos/palette/palette_tray.cc

rename to ash/system/palette/palette_tray.cc

index b63ad7e5937d4a3fd8214e5c99ec2b7b26941f0f..d78fa6e4bb1c4210dc9edb7ee9f175bc00422389 100644

--- a/ash/common/system/chromeos/palette/palette_tray.cc

+++ b/ash/system/palette/palette_tray.cc

@@ -2,22 +2,13 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "ash/common/system/chromeos/palette/palette_tray.h"

+#include "ash/system/palette/palette_tray.h"

#include "ash/common/material_design/material_design_controller.h"

#include "ash/common/session/session_state_delegate.h"

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

#include "ash/common/shelf/wm_shelf.h"

#include "ash/common/shelf/wm_shelf_util.h"

-#include "ash/common/system/chromeos/palette/palette_tool_manager.h"

-#include "ash/common/system/chromeos/palette/palette_utils.h"

-#include "ash/common/system/tray/system_menu_button.h"

-#include "ash/common/system/tray/system_tray_controller.h"

-#include "ash/common/system/tray/system_tray_delegate.h"

-#include "ash/common/system/tray/tray_bubble_wrapper.h"

-#include "ash/common/system/tray/tray_constants.h"

-#include "ash/common/system/tray/tray_popup_header_button.h"

-#include "ash/common/system/tray/tray_popup_item_style.h"

#include "ash/common/wm_shell.h"

#include "ash/common/wm_window.h"

#include "ash/public/cpp/shell_window_ids.h"

@@ -25,6 +16,15 @@

#include "ash/resources/vector_icons/vector_icons.h"

#include "ash/root_window_controller.h"

#include "ash/strings/grit/ash_strings.h"

+#include "ash/system/palette/palette_tool_manager.h"

+#include "ash/system/palette/palette_utils.h"

+#include "ash/system/tray/system_menu_button.h"

+#include "ash/system/tray/system_tray_controller.h"

+#include "ash/system/tray/system_tray_delegate.h"

+#include "ash/system/tray/tray_bubble_wrapper.h"

+#include "ash/system/tray/tray_constants.h"

+#include "ash/system/tray/tray_popup_header_button.h"

+#include "ash/system/tray/tray_popup_item_style.h"

#include "base/metrics/histogram_macros.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/resource/resource_bundle.h"

« no previous file with comments | « ash/system/palette/palette_tray.h ('k') | ash/system/palette/palette_utils.h » ('j') | no next file with comments »