chrome/browser/ui/views/ash/tab_scrubber.cc - Issue 12754010: Move immersive_mode_controller into c/b/ui/views/frame

Side by Side Diff

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

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

Side by Side Diff: chrome/browser/ui/views/ash/tab_scrubber.cc

Issue 12754010: Move immersive_mode_controller into c/b/ui/views/frame (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 9 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.

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

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/views/ash/tab_scrubber.h"	5 #include "chrome/browser/ui/views/ash/tab_scrubber.h"

6	6

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "ash/wm/window_util.h"	8 #include "ash/wm/window_util.h"

9 #include "base/metrics/histogram.h"	9 #include "base/metrics/histogram.h"

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

11 #include "chrome/browser/ui/browser_finder.h"	11 #include "chrome/browser/ui/browser_finder.h"

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

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

14 #include "chrome/browser/ui/views/immersive_mode_controller.h"	14 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"

15 #include "chrome/browser/ui/views/tabs/tab.h"	15 #include "chrome/browser/ui/views/tabs/tab.h"

16 #include "chrome/browser/ui/views/tabs/tab_strip.h"	16 #include "chrome/browser/ui/views/tabs/tab_strip.h"

17 #include "chrome/common/chrome_notification_types.h"	17 #include "chrome/common/chrome_notification_types.h"

18 #include "chrome/common/pref_names.h"	18 #include "chrome/common/pref_names.h"

19 #include "content/public/browser/notification_service.h"	19 #include "content/public/browser/notification_service.h"

20 #include "content/public/browser/notification_source.h"	20 #include "content/public/browser/notification_source.h"

21 #include "ui/aura/window.h"	21 #include "ui/aura/window.h"

22 #include "ui/base/events/event.h"	22 #include "ui/base/events/event.h"

23 #include "ui/base/events/event_utils.h"	23 #include "ui/base/events/event_utils.h"

24 #include "ui/base/gestures/gesture_configuration.h"	24 #include "ui/base/gestures/gesture_configuration.h"

(...skipping 263 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
288	288

289 void TabScrubber::CancelImmersiveReveal() {	289 void TabScrubber::CancelImmersiveReveal() {

290 if (browser_ && should_cancel_immersive_reveal_) {	290 if (browser_ && should_cancel_immersive_reveal_) {

291 BrowserView* browser_view =	291 BrowserView* browser_view =

292 BrowserView::GetBrowserViewForNativeWindow(	292 BrowserView::GetBrowserViewForNativeWindow(

293 browser_->window()->GetNativeWindow());	293 browser_->window()->GetNativeWindow());

294 browser_view->immersive_mode_controller()->RevealAndLock(false);	294 browser_view->immersive_mode_controller()->RevealAndLock(false);

295 }	295 }

296 should_cancel_immersive_reveal_ = false;	296 should_cancel_immersive_reveal_ = false;

297 }	297 }

OLD	NEW