Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Side by Side Diff: extensions/browser/app_window/app_window.h

Issue 503383002: Allow component IME extension use app.window and add 'ime' window type for app window (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_H_ 5 #ifndef EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_H_
6 #define EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_H_ 6 #define EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 CreateParams(); 143 CreateParams();
144 ~CreateParams(); 144 ~CreateParams();
145 145
146 WindowType window_type; 146 WindowType window_type;
147 Frame frame; 147 Frame frame;
148 148
149 bool has_frame_color; 149 bool has_frame_color;
150 SkColor active_frame_color; 150 SkColor active_frame_color;
151 SkColor inactive_frame_color; 151 SkColor inactive_frame_color;
152 bool alpha_enabled; 152 bool alpha_enabled;
153 bool is_ime_window;
153 154
154 // The initial content/inner bounds specification (excluding any window 155 // The initial content/inner bounds specification (excluding any window
155 // decorations). 156 // decorations).
156 BoundsSpecification content_spec; 157 BoundsSpecification content_spec;
157 158
158 // The initial window/outer bounds specification (including window 159 // The initial window/outer bounds specification (including window
159 // decorations). 160 // decorations).
160 BoundsSpecification window_spec; 161 BoundsSpecification window_spec;
161 162
162 std::string window_key; 163 std::string window_key;
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 // app. 341 // app.
341 void WindowEventsReady(); 342 void WindowEventsReady();
342 343
343 // Whether the app window wants to be alpha enabled. 344 // Whether the app window wants to be alpha enabled.
344 bool requested_alpha_enabled() const { return requested_alpha_enabled_; } 345 bool requested_alpha_enabled() const { return requested_alpha_enabled_; }
345 346
346 void SetAppWindowContentsForTesting(scoped_ptr<AppWindowContents> contents) { 347 void SetAppWindowContentsForTesting(scoped_ptr<AppWindowContents> contents) {
347 app_window_contents_ = contents.Pass(); 348 app_window_contents_ = contents.Pass();
348 } 349 }
349 350
351 // Whether the app window is an ime window.
352 bool is_ime_window() const { return is_ime_window_; }
353
350 protected: 354 protected:
351 virtual ~AppWindow(); 355 virtual ~AppWindow();
352 356
353 private: 357 private:
354 // PlatformAppBrowserTest needs access to web_contents() 358 // PlatformAppBrowserTest needs access to web_contents()
355 friend class PlatformAppBrowserTest; 359 friend class PlatformAppBrowserTest;
356 360
357 // content::WebContentsDelegate implementation. 361 // content::WebContentsDelegate implementation.
358 virtual void CloseContents(content::WebContents* contents) OVERRIDE; 362 virtual void CloseContents(content::WebContents* contents) OVERRIDE;
359 virtual bool ShouldSuppressDialogs() OVERRIDE; 363 virtual bool ShouldSuppressDialogs() OVERRIDE;
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 // Cache the desired value of the always-on-top property. When windows enter 544 // Cache the desired value of the always-on-top property. When windows enter
541 // fullscreen or overlap the Windows taskbar, this property will be 545 // fullscreen or overlap the Windows taskbar, this property will be
542 // automatically and silently switched off for security reasons. It is 546 // automatically and silently switched off for security reasons. It is
543 // reinstated when the window exits fullscreen and moves away from the 547 // reinstated when the window exits fullscreen and moves away from the
544 // taskbar. 548 // taskbar.
545 bool cached_always_on_top_; 549 bool cached_always_on_top_;
546 550
547 // Whether |alpha_enabled| was set in the CreateParams. 551 // Whether |alpha_enabled| was set in the CreateParams.
548 bool requested_alpha_enabled_; 552 bool requested_alpha_enabled_;
549 553
554 // Whether |ime| was set in the CreateParams.
555 bool is_ime_window_;
556
550 DISALLOW_COPY_AND_ASSIGN(AppWindow); 557 DISALLOW_COPY_AND_ASSIGN(AppWindow);
551 }; 558 };
552 559
553 } // namespace extensions 560 } // namespace extensions
554 561
555 #endif // EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_H_ 562 #endif // EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698