mojo/examples/window_manager/debug_panel.cc - Issue 514063003: Update view_manager and window_manager to make use of content handling.

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: mojo/examples/window_manager/debug_panel.cc

Issue 514063003: Update view_manager and window_manager to make use of content handling. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@viewman2

Patch Set: Created 6 years, 4 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

« no previous file with comments | « mojo/examples/window_manager/debug_panel.h ('k') | mojo/examples/window_manager/window_manager.cc » ('j') | mojo/public/cpp/application/service_provider_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/examples/window_manager/debug_panel.cc

diff --git a/mojo/examples/window_manager/debug_panel.cc b/mojo/examples/window_manager/debug_panel.cc

index 1648d0c53fa230c45b31f11d50d433c65ad9697a..022695d132ebe166a2ad5c331c4701208d4f7d1e 100644

--- a/mojo/examples/window_manager/debug_panel.cc

+++ b/mojo/examples/window_manager/debug_panel.cc

@@ -35,7 +35,6 @@ DebugPanel::DebugPanel(Delegate* delegate, View* view)

base::ASCIIToUTF16("Source window"), kNavigationTargetGroupId)),

navigation_target_default_(new views::RadioButton(

base::ASCIIToUTF16("Default"), kNavigationTargetGroupId)),

- next_color_(0),

colored_square_(new views::BlueButton(

this, base::ASCIIToUTF16("Local nav test"))),

close_last_(new views::BlueButton(

@@ -117,8 +116,7 @@ void DebugPanel::Layout(views::View* view) {

void DebugPanel::ButtonPressed(views::Button* sender, const ui::Event& event) {

if (sender == colored_square_) {

- Navigate(base::StringPrintf("mojo://mojo_embedded_app/%x",

- kColors[next_color_ % arraysize(kColors)]));

+ Navigate("mojo://mojo_embedded_app/");

next_color_++;

sky 2014/09/02 15:47:15 You removed next_color_ from the initializer. Shou

Aaron Boodman 2014/09/02 19:10:44 ah yes, thanks.

} else if (sender == close_last_) {

delegate_->CloseTopWindow();