chrome/browser/ui/views/toolbar/toolbar_view.cc - Issue 71743002: [Toolbar Views] Move toolbar files to a new subdirectory.

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/views/toolbar/toolbar_view.cc

Issue 71743002: [Toolbar Views] Move toolbar files to a new subdirectory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 1 month 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: chrome/browser/ui/views/toolbar/toolbar_view.cc

diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc

similarity index 98%

rename from chrome/browser/ui/views/toolbar_view.cc

rename to chrome/browser/ui/views/toolbar/toolbar_view.cc

index f8d46e384d5a224f3aa8799e96fdb30241421f4d..3f65ea5cf7af4954530d49a8b04ef52ffcdf9d2b 100644

--- a/chrome/browser/ui/views/toolbar_view.cc

+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc

@@ -2,7 +2,7 @@

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

// found in the LICENSE file.

-#include "chrome/browser/ui/views/toolbar_view.h"

+#include "chrome/browser/ui/views/toolbar/toolbar_view.h"

#include "base/command_line.h"

#include "base/debug/trace_event.h"

@@ -27,15 +27,16 @@

#include "chrome/browser/ui/tabs/tab_strip_model.h"

#include "chrome/browser/ui/toolbar/wrench_menu_model.h"

#include "chrome/browser/ui/view_ids.h"

-#include "chrome/browser/ui/views/browser_actions_container.h"

#include "chrome/browser/ui/views/frame/browser_view.h"

-#include "chrome/browser/ui/views/home_button.h"

#include "chrome/browser/ui/views/location_bar/page_action_image_view.h"

#include "chrome/browser/ui/views/location_bar/star_view.h"

#include "chrome/browser/ui/views/location_bar/translate_icon_view.h"

#include "chrome/browser/ui/views/outdated_upgrade_bubble_view.h"

-#include "chrome/browser/ui/views/wrench_menu.h"

-#include "chrome/browser/ui/views/wrench_toolbar_button.h"

+#include "chrome/browser/ui/views/toolbar/browser_actions_container.h"

+#include "chrome/browser/ui/views/toolbar/home_button.h"

+#include "chrome/browser/ui/views/toolbar/reload_button.h"

+#include "chrome/browser/ui/views/toolbar/wrench_menu.h"

+#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h"

#include "chrome/browser/upgrade_detector.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"